diff --git a/build.gradle b/build.gradle
index 1bed6f0a4d..212460cc37 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,10 +31,6 @@ dependencies {
     compile 'com.google.code.gson:gson:2.8.0'
     compile group: 'org.apache.commons', name: 'commons-collections4', version: '4.0'
 
-//    TODO: to remove Junit4 after all tests are migrated to Junit5
-    compile 'junit:junit:4.13'
-    testCompile "junit:junit:4.13.1"
-
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_100Test.java b/src/test/java/com/fishercoder/firstthousand/_100Test.java
index 77d863a8ca..d0dfec5535 100644
--- a/src/test/java/com/fishercoder/firstthousand/_100Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_100Test.java
@@ -3,20 +3,20 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._100;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _100Test {
-    private static _100.Solution1 solution1;
+    private _100.Solution1 solution1;
     private static TreeNode p;
     private static TreeNode q;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _100.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_101Test.java b/src/test/java/com/fishercoder/firstthousand/_101Test.java
index e6dd3f510a..844cb859d3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_101Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_101Test.java
@@ -6,18 +6,18 @@
 
 import java.util.Arrays;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _101Test {
-    private static _101.Solution1 solution1;
-    private static _101.Solution2 solution2;
+    private _101.Solution1 solution1;
+    private _101.Solution2 solution2;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _101.Solution1();
         solution2 = new _101.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_102Test.java b/src/test/java/com/fishercoder/firstthousand/_102Test.java
index 63f13caf10..b4d7576d4f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_102Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_102Test.java
@@ -4,17 +4,17 @@
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._102;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
 public class _102Test {
-    private static _102.Solution1 solution1;
+    private _102.Solution1 solution1;
     private static TreeNode treeRoot;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _102.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_103Test.java b/src/test/java/com/fishercoder/firstthousand/_103Test.java
index 8564e411c6..03cc0adc40 100644
--- a/src/test/java/com/fishercoder/firstthousand/_103Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_103Test.java
@@ -4,17 +4,17 @@
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._103;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
 public class _103Test {
-    private static _103.Solution1 solution1;
+    private _103.Solution1 solution1;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _103.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_104Test.java b/src/test/java/com/fishercoder/firstthousand/_104Test.java
index d82bbf0b57..3fde71eae6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_104Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_104Test.java
@@ -6,18 +6,18 @@
 
 import java.util.Arrays;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _104Test {
-    private static _104.Solution1 solution1;
-    private static _104.Solution2 solution2;
+    private _104.Solution1 solution1;
+    private _104.Solution2 solution2;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _104.Solution1();
         solution2 = new _104.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_105Test.java b/src/test/java/com/fishercoder/firstthousand/_105Test.java
index 64f239dde2..2e83619a64 100644
--- a/src/test/java/com/fishercoder/firstthousand/_105Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_105Test.java
@@ -6,20 +6,20 @@
 
 import java.util.Arrays;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _105Test {
-    private static _105.Solution1 solution1;
+    private _105.Solution1 solution1;
     private static TreeNode expected;
     private static TreeNode actual;
     private static int[] preorder;
     private static int[] inorder;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _105.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_106Test.java b/src/test/java/com/fishercoder/firstthousand/_106Test.java
index 734a9fa36a..ab975cf3a5 100644
--- a/src/test/java/com/fishercoder/firstthousand/_106Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_106Test.java
@@ -3,23 +3,23 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._106;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _106Test {
-    private static _106.Solution1 solution1;
-    private static _106.Solution2 solution2;
+    private _106.Solution1 solution1;
+    private _106.Solution2 solution2;
     private static TreeNode expected;
     private static TreeNode actual;
     private static int[] inorder;
     private static int[] postorder;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _106.Solution1();
         solution2 = new _106.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_107Test.java b/src/test/java/com/fishercoder/firstthousand/_107Test.java
index 46cd8fd79e..f69793ec62 100644
--- a/src/test/java/com/fishercoder/firstthousand/_107Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_107Test.java
@@ -4,17 +4,17 @@
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._107;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
 public class _107Test {
-    private static _107.Solution1 solution1;
+    private _107.Solution1 solution1;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _107.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_108Test.java b/src/test/java/com/fishercoder/firstthousand/_108Test.java
index 02be4258ef..78b039357e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_108Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_108Test.java
@@ -2,15 +2,15 @@
 
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._108;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _108Test {
-    private static _108.Solution1 solution1;
+    private _108.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _108.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_109Test.java b/src/test/java/com/fishercoder/firstthousand/_109Test.java
index c404793ce1..934f91e668 100644
--- a/src/test/java/com/fishercoder/firstthousand/_109Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_109Test.java
@@ -11,7 +11,7 @@
 import java.util.Arrays;
 
 public class _109Test {
-    private static _109.Solution1 solution1;
+    private _109.Solution1 solution1;
     private static ListNode head;
     private static TreeNode expected;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_10Test.java b/src/test/java/com/fishercoder/firstthousand/_10Test.java
index 4c6e489de6..b400d73511 100644
--- a/src/test/java/com/fishercoder/firstthousand/_10Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_10Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _10Test {
-    private static _10.Solution1 solution1;
+    private _10.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_110Test.java b/src/test/java/com/fishercoder/firstthousand/_110Test.java
index 8390df79af..03d9a4a6f8 100644
--- a/src/test/java/com/fishercoder/firstthousand/_110Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_110Test.java
@@ -3,20 +3,20 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._110;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _110Test {
-    private static _110.Solution1 solution1;
-    private static _110.Solution2 solution2;
+    private _110.Solution1 solution1;
+    private _110.Solution2 solution2;
     private static TreeNode treeNode;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _110.Solution1();
         solution2 = new _110.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_113Test.java b/src/test/java/com/fishercoder/firstthousand/_113Test.java
index 787fee4615..6806ee5047 100644
--- a/src/test/java/com/fishercoder/firstthousand/_113Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_113Test.java
@@ -3,24 +3,24 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._113;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _113Test {
-    private static _113.Solution1 solution1;
-    private static _113.Solution2 solution2;
+    private _113.Solution1 solution1;
+    private _113.Solution2 solution2;
     private static TreeNode root;
     private static int sum;
     private static List<List<Integer>> expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _113.Solution1();
         solution2 = new _113.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_114Test.java b/src/test/java/com/fishercoder/firstthousand/_114Test.java
index ad48bcfbbc..5ff6418397 100644
--- a/src/test/java/com/fishercoder/firstthousand/_114Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_114Test.java
@@ -3,17 +3,17 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._114;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
 public class _114Test {
-  private static _114.Solution1 solution1;
+  private _114.Solution1 solution1;
   private static TreeNode root;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _114.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_115Test.java b/src/test/java/com/fishercoder/firstthousand/_115Test.java
index d411c80484..b83a1eebc9 100644
--- a/src/test/java/com/fishercoder/firstthousand/_115Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_115Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._115;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _115Test {
-  private static _115.Solution1 solution1;
+  private _115.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _115.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_116Test.java b/src/test/java/com/fishercoder/firstthousand/_116Test.java
index 82c40b453b..79d9214f5b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_116Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_116Test.java
@@ -5,9 +5,9 @@
 import org.junit.jupiter.api.Test;
 
 public class _116Test {
-    private static _116.Solution1 solution1;
-    private static _116.Solution2 solution2;
-    private static _116.Node root;
+    private _116.Solution1 solution1;
+    private _116.Solution2 solution2;
+    private _116.Node root;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_117Test.java b/src/test/java/com/fishercoder/firstthousand/_117Test.java
index 5fb79bf849..0054547070 100644
--- a/src/test/java/com/fishercoder/firstthousand/_117Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_117Test.java
@@ -1,15 +1,15 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._117;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _117Test {
-    private static _117.Solution1 solution1;
-    private static _117.Node root;
+    private _117.Solution1 solution1;
+    private _117.Node root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _117.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_118Test.java b/src/test/java/com/fishercoder/firstthousand/_118Test.java
index 930ce063c0..327fc3e1c3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_118Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_118Test.java
@@ -2,16 +2,16 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._118;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _118Test {
-    private static _118.Solution1 solution1;
-    private static _118.Solution2 solution2;
-    private static _118.Solution3 solution3;
+    private _118.Solution1 solution1;
+    private _118.Solution2 solution2;
+    private _118.Solution3 solution3;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _118.Solution1();
         solution2 = new _118.Solution2();
         solution3 = new _118.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_119Test.java b/src/test/java/com/fishercoder/firstthousand/_119Test.java
index 477d5ef81d..c6fef35dc6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_119Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_119Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._119;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _119Test {
-    private static _119.Solution1 solution1;
-    private static _119.Solution2 solution2;
+    private _119.Solution1 solution1;
+    private _119.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _119.Solution1();
         solution2 = new _119.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_11Test.java b/src/test/java/com/fishercoder/firstthousand/_11Test.java
index 715a5af9bb..9b7d6f890e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_11Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_11Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _11Test {
-    private static _11.Solution1 solution1;
-    private static _11.Solution2 solution2;
+    private _11.Solution1 solution1;
+    private _11.Solution2 solution2;
     private static int[] height;
     private static int expected;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_120Test.java b/src/test/java/com/fishercoder/firstthousand/_120Test.java
index b28074dcfb..e0e9ae3574 100644
--- a/src/test/java/com/fishercoder/firstthousand/_120Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_120Test.java
@@ -4,17 +4,17 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _120Test {
-  private static _120.Solution1 solution1;
+  private _120.Solution1 solution1;
   private static List<List<Integer>> triangle;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _120.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_121Test.java b/src/test/java/com/fishercoder/firstthousand/_121Test.java
index ce9cfadb1c..adccd3e4b6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_121Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_121Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._121;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _121Test {
-    private static _121.Solution1 solution1;
-    private static _121.Solution2 solution2;
+    private _121.Solution1 solution1;
+    private _121.Solution2 solution2;
     private static int[] prices;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _121.Solution1();
         solution2 = new _121.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_122Test.java b/src/test/java/com/fishercoder/firstthousand/_122Test.java
index a252de3f92..c4c06b28bd 100644
--- a/src/test/java/com/fishercoder/firstthousand/_122Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_122Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._122;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _122Test {
-  private static _122.Solution1 solution1;
-  private static _122.Solution2 solution2;
+  private _122.Solution1 solution1;
+  private _122.Solution2 solution2;
   private static int[] prices;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _122.Solution1();
     solution2 = new _122.Solution2();
   }
diff --git a/src/test/java/com/fishercoder/firstthousand/_123Test.java b/src/test/java/com/fishercoder/firstthousand/_123Test.java
index 33d9944b13..13474cf22b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_123Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_123Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._123;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _123Test {
-  private static _123.Solution1 solution1;
+  private _123.Solution1 solution1;
   private static int[] prices;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _123.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_125Test.java b/src/test/java/com/fishercoder/firstthousand/_125Test.java
index d77986c690..fecfe069f3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_125Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_125Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._125;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _125Test {
-    private static _125.Solution1 solution1;
+    private _125.Solution1 solution1;
     private static String s;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _125.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_127Test.java b/src/test/java/com/fishercoder/firstthousand/_127Test.java
index 5bb850623d..a3f76b282a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_127Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_127Test.java
@@ -1,21 +1,21 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._127;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _127Test {
-  private static _127.Solution1 solution1;
+  private _127.Solution1 solution1;
   private static List<String> wordList;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _127.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_128Test.java b/src/test/java/com/fishercoder/firstthousand/_128Test.java
index 4860f278bb..2a567a2ab3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_128Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_128Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._128;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _128Test {
-    private static _128.Solution3 solution3;
-    private static _128.Solution4 solution4;
+    private _128.Solution3 solution3;
+    private _128.Solution4 solution4;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution3 = new _128.Solution3();
         solution4 = new _128.Solution4();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_129Test.java b/src/test/java/com/fishercoder/firstthousand/_129Test.java
index 2cfbcf98ec..cb589e3378 100644
--- a/src/test/java/com/fishercoder/firstthousand/_129Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_129Test.java
@@ -11,8 +11,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _129Test {
-    private static _129.Solution1 solution1;
-    private static _129.Solution2 solution2;
+    private _129.Solution1 solution1;
+    private _129.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_12Test.java b/src/test/java/com/fishercoder/firstthousand/_12Test.java
index a85291419f..0f511d5595 100644
--- a/src/test/java/com/fishercoder/firstthousand/_12Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_12Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _12Test {
-    private static _12.Solution1 solution1;
+    private _12.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_130Test.java b/src/test/java/com/fishercoder/firstthousand/_130Test.java
index b5fdff0b12..8b8a7f1293 100644
--- a/src/test/java/com/fishercoder/firstthousand/_130Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_130Test.java
@@ -2,19 +2,19 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._130;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _130Test {
-    private static _130.Solution1 solution1;
-    private static _130.Solution2 solution2;
-    private static char[][] board;
-    private static char[][] expected;
+    private _130.Solution1 solution1;
+    private _130.Solution2 solution2;
+    private char[][] board;
+    private char[][] expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _130.Solution1();
         solution2 = new _130.Solution2();
     }
@@ -28,7 +28,7 @@ public void test1() {
                 + "[\"O\",\"O\",\"X\",\"X\",\"O\",\"X\",\"X\",\"O\",\"O\",\"O\"],[\"X\",\"O\",\"O\",\"X\",\"X\",\"X\",\"X\",\"X\",\"X\",\"O\"],[\"X\",\"O\",\"X\",\"X\",\"X\",\"X\",\"X\",\"O\",\"X\",\"O\"],[\"X\",\"X\",\"O\",\"X\",\"X\",\"X\",\"X\",\"O\",\"O\",\"X\"],[\"O\",\"O\",\"O\",\"O\",\"X\",\"X\",\"X\",\"O\",\"X\",\"O\"],"
                 + "[\"X\",\"X\",\"O\",\"X\",\"X\",\"X\",\"X\",\"O\",\"O\",\"O\"]");
         solution1.solve(board);
-        assertEquals(expected, board);
+        assertArrayEquals(expected, board);
     }
 
     @Test
@@ -43,7 +43,7 @@ public void test2() {
         solution2.solve(board);
         CommonUtils.print2DCharArray(board);
         CommonUtils.print2DCharArray(expected);
-        assertEquals(expected, board);
+        assertArrayEquals(expected, board);
     }
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/fishercoder/firstthousand/_131Test.java b/src/test/java/com/fishercoder/firstthousand/_131Test.java
index b11701b5f5..0cdf7b117d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_131Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_131Test.java
@@ -4,17 +4,17 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _131Test {
-  private static _131.Solution1 solution1;
+  private _131.Solution1 solution1;
   private static List<List<String>> expected;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _131.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_132Test.java b/src/test/java/com/fishercoder/firstthousand/_132Test.java
index eff0bf889e..37d29ae235 100644
--- a/src/test/java/com/fishercoder/firstthousand/_132Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_132Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._132;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _132Test {
-  private static _132.Solution1 solution1;
+  private _132.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _132.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_133Test.java b/src/test/java/com/fishercoder/firstthousand/_133Test.java
index a80a0eef27..ebefd35c20 100644
--- a/src/test/java/com/fishercoder/firstthousand/_133Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_133Test.java
@@ -2,21 +2,21 @@
 
 import com.fishercoder.solutions.firstthousand._133;
 import com.fishercoder.solutions.firstthousand._133.Solution1.Node;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _133Test {
-    private static _133.Solution1 solution1;
+    private _133.Solution1 solution1;
     private static Node root;
     private static Node actual;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _133.Solution1();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         root = null;
         actual = null;
diff --git a/src/test/java/com/fishercoder/firstthousand/_134Test.java b/src/test/java/com/fishercoder/firstthousand/_134Test.java
index 87f0f2e5ec..bf01cd6330 100644
--- a/src/test/java/com/fishercoder/firstthousand/_134Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_134Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._134;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _134Test {
-  private static _134.Solution1 solution1;
+  private _134.Solution1 solution1;
   private static int[] gas;
   private static int[] cost;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _134.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_136Test.java b/src/test/java/com/fishercoder/firstthousand/_136Test.java
index 49d38f8f32..c518c60143 100644
--- a/src/test/java/com/fishercoder/firstthousand/_136Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_136Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._136;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _136Test {
-    private static _136.Solution1 solution1;
-    private static _136.Solution2 solution2;
+    private _136.Solution1 solution1;
+    private _136.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _136.Solution1();
         solution2 = new _136.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_139Test.java b/src/test/java/com/fishercoder/firstthousand/_139Test.java
index 2882cc6503..a87beec83d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_139Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_139Test.java
@@ -1,24 +1,24 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._139;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _139Test {
-    private static _139.Solution1 solution1;
-    private static _139.Solution2 solution2;
-    private static _139.Solution3 solution3;
+    private _139.Solution1 solution1;
+    private _139.Solution2 solution2;
+    private _139.Solution3 solution3;
     private static String s;
     private static List<String> wordDict;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _139.Solution1();
         solution2 = new _139.Solution2();
         solution3 = new _139.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_13Test.java b/src/test/java/com/fishercoder/firstthousand/_13Test.java
index 763b214756..0dbb3ea6fc 100644
--- a/src/test/java/com/fishercoder/firstthousand/_13Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_13Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _13Test {
-    private static _13.Solution1 solution1;
+    private _13.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_140Test.java b/src/test/java/com/fishercoder/firstthousand/_140Test.java
index 99ff99d128..727477c1c8 100644
--- a/src/test/java/com/fishercoder/firstthousand/_140Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_140Test.java
@@ -12,7 +12,7 @@
 
 
 public class _140Test {
-    private static _140.Solution1 solution1;
+    private _140.Solution1 solution1;
     private static String s;
     private static List<String> wordDict;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_141Test.java b/src/test/java/com/fishercoder/firstthousand/_141Test.java
index bd1196a819..1bbc312cf7 100644
--- a/src/test/java/com/fishercoder/firstthousand/_141Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_141Test.java
@@ -2,17 +2,17 @@
 
 import com.fishercoder.common.utils.LinkedListUtils;
 import com.fishercoder.solutions.firstthousand._141;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _141Test {
-    private static _141.Solution1 solution1;
-    private static _141.Solution2 solution2;
+    private _141.Solution1 solution1;
+    private _141.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _141.Solution1();
         solution2 = new _141.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_143Test.java b/src/test/java/com/fishercoder/firstthousand/_143Test.java
index 6f487d443b..9353fd5fd3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_143Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_143Test.java
@@ -3,21 +3,21 @@
 import com.fishercoder.common.classes.ListNode;
 import com.fishercoder.common.utils.LinkedListUtils;
 import com.fishercoder.solutions.firstthousand._143;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _143Test {
-    private static _143.Solution1 solution1;
-    private static _143.Solution2 solution2;
+    private _143.Solution1 solution1;
+    private _143.Solution2 solution2;
     private static ListNode head;
     private static ListNode expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _143.Solution1();
         solution2 = new _143.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_144Test.java b/src/test/java/com/fishercoder/firstthousand/_144Test.java
index 6cb92c6639..74f6b88e48 100644
--- a/src/test/java/com/fishercoder/firstthousand/_144Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_144Test.java
@@ -12,9 +12,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _144Test {
-    private static _144.Solution1 solution1;
-    private static _144.Solution2 solution2;
-    private static _144.Solution3 solution3;
+    private _144.Solution1 solution1;
+    private _144.Solution2 solution2;
+    private _144.Solution3 solution3;
     private static TreeNode root;
     private static List<Integer> inorder;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_145Test.java b/src/test/java/com/fishercoder/firstthousand/_145Test.java
index cb0fc26352..ffec375327 100644
--- a/src/test/java/com/fishercoder/firstthousand/_145Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_145Test.java
@@ -4,24 +4,24 @@
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._145;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _145Test {
-    private static _145.Solution1 solution1;
-    private static _145.Solution2 solution2;
-    private static _145.Solution3 solution3;
+    private _145.Solution1 solution1;
+    private _145.Solution2 solution2;
+    private _145.Solution3 solution3;
     private static TreeNode root;
     private static List<Integer> expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _145.Solution1();
         solution2 = new _145.Solution2();
         solution3 = new _145.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_148Test.java b/src/test/java/com/fishercoder/firstthousand/_148Test.java
index 2a2fca3c71..e9274d1240 100644
--- a/src/test/java/com/fishercoder/firstthousand/_148Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_148Test.java
@@ -9,10 +9,10 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _148Test {
-    private static _148.Solution1 solution1;
-    private static _148.Solution2 solution2;
-    private static _148.Solution3 solution3;
-    private static _148.Solution4 solution4;
+    private _148.Solution1 solution1;
+    private _148.Solution2 solution2;
+    private _148.Solution3 solution3;
+    private _148.Solution4 solution4;
     private static ListNode head;
     private static ListNode expected;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_149Test.java b/src/test/java/com/fishercoder/firstthousand/_149Test.java
index 5e0d066c56..a5b4ab8aea 100644
--- a/src/test/java/com/fishercoder/firstthousand/_149Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_149Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._149;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _149Test {
-    private static _149.Solution1 solution1;
+    private _149.Solution1 solution1;
     private static int[][] points;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _149.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_14Test.java b/src/test/java/com/fishercoder/firstthousand/_14Test.java
index bda39045e3..47509060a5 100644
--- a/src/test/java/com/fishercoder/firstthousand/_14Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_14Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _14Test {
-    private static _14.Solution1 solution1;
-    private static _14.Solution2 solution2;
+    private _14.Solution1 solution1;
+    private _14.Solution2 solution2;
     private static String[] strs;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_150Test.java b/src/test/java/com/fishercoder/firstthousand/_150Test.java
index 3cc4361e75..5b0bda25a8 100644
--- a/src/test/java/com/fishercoder/firstthousand/_150Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_150Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._150;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _150Test {
-    private static _150.Solution1 solution1;
+    private _150.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _150.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_151Test.java b/src/test/java/com/fishercoder/firstthousand/_151Test.java
index 8c839edbcc..e46e9233a8 100644
--- a/src/test/java/com/fishercoder/firstthousand/_151Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_151Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._151;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _151Test {
-    private static _151.Solution1 solution1;
-    private static _151.Solution2 solution2;
-    private static _151.Solution3 solution3;
+    private _151.Solution1 solution1;
+    private _151.Solution2 solution2;
+    private _151.Solution3 solution3;
     private static String s;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _151.Solution1();
         solution2 = new _151.Solution2();
         solution3 = new _151.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_153Test.java b/src/test/java/com/fishercoder/firstthousand/_153Test.java
index 81332146af..99e34cbf3a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_153Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_153Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._153;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _153Test {
-    private static _153.Solution1 solution1;
+    private _153.Solution1 solution1;
     private static int expected;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _153.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_154Test.java b/src/test/java/com/fishercoder/firstthousand/_154Test.java
index 50c8729917..8f15067006 100644
--- a/src/test/java/com/fishercoder/firstthousand/_154Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_154Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._154;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _154Test {
-    private static _154.Solution1 solution1;
+    private _154.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _154.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_155Test.java b/src/test/java/com/fishercoder/firstthousand/_155Test.java
index fb31a7d033..a94489c4cd 100644
--- a/src/test/java/com/fishercoder/firstthousand/_155Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_155Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _155Test {
-    private static _155.Solution1.MinStack minStack1;
-    private static _155.Solution2.MinStack minStack2;
+    private _155.Solution1.MinStack minStack1;
+    private _155.Solution2.MinStack minStack2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_156Test.java b/src/test/java/com/fishercoder/firstthousand/_156Test.java
index bb5b5262c9..35c863d311 100644
--- a/src/test/java/com/fishercoder/firstthousand/_156Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_156Test.java
@@ -3,20 +3,20 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._156;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _156Test {
-    private static _156.Solution1 solution1;
+    private _156.Solution1 solution1;
     private static TreeNode root;
     private static TreeNode expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _156.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_159Test.java b/src/test/java/com/fishercoder/firstthousand/_159Test.java
index c9c5e4ae10..02c9e44b1b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_159Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_159Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._159;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _159Test {
-    private static _159.Solution1 solution1;
-    private static _159.Solution2 solution2;
+    private _159.Solution1 solution1;
+    private _159.Solution2 solution2;
     private static String s;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _159.Solution1();
         solution2 = new _159.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_15Test.java b/src/test/java/com/fishercoder/firstthousand/_15Test.java
index f00d39f373..dee7739f87 100644
--- a/src/test/java/com/fishercoder/firstthousand/_15Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_15Test.java
@@ -11,7 +11,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _15Test {
-    private static _15.Solution1 solution1;
+    private _15.Solution1 solution1;
     private static int[] nums;
     private static List<List<Integer>> expected;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_160Test.java b/src/test/java/com/fishercoder/firstthousand/_160Test.java
index 4d831c9432..2851bddd01 100644
--- a/src/test/java/com/fishercoder/firstthousand/_160Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_160Test.java
@@ -2,29 +2,30 @@
 
 import com.fishercoder.common.classes.ListNode;
 import com.fishercoder.solutions.firstthousand._160;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _160Test {
-    private static _160.Solution1 solution1;
-    private static _160.Solution2 solution2;
-    private static _160.Solution3 solution3;
-    private static ListNode headA;
-    private static ListNode headB;
-    private static ListNode expected;
-
-    @BeforeClass
-    public static void setup() {
+    private _160.Solution1 solution1;
+    private _160.Solution2 solution2;
+    private _160.Solution3 solution3;
+    private ListNode headA;
+    private ListNode headB;
+    private ListNode expected;
+
+    @BeforeEach
+    public void setup() {
         solution1 = new _160.Solution1();
         solution2 = new _160.Solution2();
         solution3 = new _160.Solution3();
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void test1() {
         headA = new ListNode(3);
         headB = new ListNode(2);
@@ -35,7 +36,7 @@ public void test1() {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void test2() {
         headA = new ListNode(3);
         headB = new ListNode(2);
diff --git a/src/test/java/com/fishercoder/firstthousand/_161Test.java b/src/test/java/com/fishercoder/firstthousand/_161Test.java
index 8e1d340713..f37da3e98e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_161Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_161Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._161;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _161Test {
-  private static _161.Solution1 solution1;
+  private _161.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _161.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_162Test.java b/src/test/java/com/fishercoder/firstthousand/_162Test.java
index 2113ce2d30..6637472d87 100644
--- a/src/test/java/com/fishercoder/firstthousand/_162Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_162Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _162Test {
-    private static _162.Solution1 solution1;
-    private static _162.Solution2 solution2;
+    private _162.Solution1 solution1;
+    private _162.Solution2 solution2;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_163Test.java b/src/test/java/com/fishercoder/firstthousand/_163Test.java
index 11da0a9af7..53b9ba26d9 100644
--- a/src/test/java/com/fishercoder/firstthousand/_163Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_163Test.java
@@ -12,7 +12,7 @@
 
 public class _163Test {
 
-    private static _163.Solution1 solution1;
+    private _163.Solution1 solution1;
     private static List<List<Integer>> expected;
     private static List<List<Integer>> actual;
     private static int[] nums;
diff --git a/src/test/java/com/fishercoder/firstthousand/_164Test.java b/src/test/java/com/fishercoder/firstthousand/_164Test.java
index 9b7d71b734..bfddab32c3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_164Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_164Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._164;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _164Test {
-  private static _164.Solution1 solution1;
+  private _164.Solution1 solution1;
   private static int[] nums;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _164.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_165Test.java b/src/test/java/com/fishercoder/firstthousand/_165Test.java
index c82ca14d9f..e7b225a00c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_165Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_165Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._165;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _165Test {
-  private static _165.Solution1 solution1;
+  private _165.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _165.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_166Test.java b/src/test/java/com/fishercoder/firstthousand/_166Test.java
index da6cb1776b..ae7a33b098 100644
--- a/src/test/java/com/fishercoder/firstthousand/_166Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_166Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._166;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _166Test {
-  private static _166.Solution1 solution1;
+  private _166.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _166.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_167Test.java b/src/test/java/com/fishercoder/firstthousand/_167Test.java
index b683325073..359261a3d3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_167Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_167Test.java
@@ -1,21 +1,21 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._167;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _167Test {
-    private static _167.Solution1 solution1;
-    private static _167.Solution2 solution2;
-    private static _167.Solution3 solution3;
+    private _167.Solution1 solution1;
+    private _167.Solution2 solution2;
+    private _167.Solution3 solution3;
     private static int[] numbers;
     private static int[] expected;
     private int target;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _167.Solution1();
         solution2 = new _167.Solution2();
         solution3 = new _167.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_168Test.java b/src/test/java/com/fishercoder/firstthousand/_168Test.java
index b4b6e6bb2a..0d0750b487 100644
--- a/src/test/java/com/fishercoder/firstthousand/_168Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_168Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._168;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _168Test {
-  private static _168.Solution1 solution1;
+  private _168.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _168.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_169Test.java b/src/test/java/com/fishercoder/firstthousand/_169Test.java
index c1f1c34a5a..e45d16212d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_169Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_169Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._169;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _169Test {
-    private static _169.Solution1 solution1;
-    private static _169.Solution2 solution2;
-    private static _169.Solution3 solution3;
+    private _169.Solution1 solution1;
+    private _169.Solution2 solution2;
+    private _169.Solution3 solution3;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _169.Solution1();
         solution2 = new _169.Solution2();
         solution3 = new _169.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_16Test.java b/src/test/java/com/fishercoder/firstthousand/_16Test.java
index 1eb6ba6f09..57aeea40a0 100644
--- a/src/test/java/com/fishercoder/firstthousand/_16Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_16Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _16Test {
-    private static _16.Solution1 solution1;
+    private _16.Solution1 solution1;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_171Test.java b/src/test/java/com/fishercoder/firstthousand/_171Test.java
index 9457ff0be6..9f514ddd09 100644
--- a/src/test/java/com/fishercoder/firstthousand/_171Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_171Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._171;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _171Test {
-  private static _171.Solution1 solution1;
+  private _171.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _171.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_174Test.java b/src/test/java/com/fishercoder/firstthousand/_174Test.java
index 8fbaac0fe5..9f7b9a8e6d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_174Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_174Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._174;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _174Test {
-  private static _174.Solution1 solution1;
+  private _174.Solution1 solution1;
   private int[][] dungeon;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _174.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_179Test.java b/src/test/java/com/fishercoder/firstthousand/_179Test.java
index dc1deb526c..3351a18df3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_179Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_179Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._179;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _179Test {
-    private static _179.Solution1 solution1;
-    private static _179.Solution2 solution2;
+    private _179.Solution1 solution1;
+    private _179.Solution2 solution2;
     private static int[] nums;
     private static String expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _179.Solution1();
         solution2 = new _179.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_17Test.java b/src/test/java/com/fishercoder/firstthousand/_17Test.java
index 62de46f6ef..ac26ea4e19 100644
--- a/src/test/java/com/fishercoder/firstthousand/_17Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_17Test.java
@@ -12,9 +12,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _17Test {
-    private static _17.Solution1 solution1;
-    private static _17.Solution2 solution2;
-    private static _17.Solution3 solution3;
+    private _17.Solution1 solution1;
+    private _17.Solution2 solution2;
+    private _17.Solution3 solution3;
     private static String digits;
     private static List<String> expected;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_186Test.java b/src/test/java/com/fishercoder/firstthousand/_186Test.java
index 44bebc37e2..14e52bf8f7 100644
--- a/src/test/java/com/fishercoder/firstthousand/_186Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_186Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._186;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _186Test {
-  private static _186.Solution1 solution1;
+  private _186.Solution1 solution1;
   private static char[] s;
   private static char[] expected;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _186.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_187Test.java b/src/test/java/com/fishercoder/firstthousand/_187Test.java
index 31599c76ad..333be29f9c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_187Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_187Test.java
@@ -1,23 +1,23 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._187;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _187Test {
-    private static _187.Solution1 solution1;
-    private static _187.Solution2 solution2;
+    private _187.Solution1 solution1;
+    private _187.Solution2 solution2;
     private static String s;
     private static List<String> expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _187.Solution1();
         solution2 = new _187.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_189Test.java b/src/test/java/com/fishercoder/firstthousand/_189Test.java
index 2773cac689..736b2f7cc1 100644
--- a/src/test/java/com/fishercoder/firstthousand/_189Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_189Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._189;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _189Test {
-    private static _189.Solution1 solution1;
-    private static _189.Solution2 solution2;
-    private static _189.Solution3 solution3;
-    private static _189.Solution4 solution4;
+    private _189.Solution1 solution1;
+    private _189.Solution2 solution2;
+    private _189.Solution3 solution3;
+    private _189.Solution4 solution4;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _189.Solution1();
         solution2 = new _189.Solution2();
         solution3 = new _189.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_18Test.java b/src/test/java/com/fishercoder/firstthousand/_18Test.java
index 78e248abe8..75f234b57a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_18Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_18Test.java
@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.Test;
 
 public class _18Test {
-    private static _18.Solution1 solution1;
+    private _18.Solution1 solution1;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_190Test.java b/src/test/java/com/fishercoder/firstthousand/_190Test.java
index 39e8de2bc2..1725ba6ef9 100644
--- a/src/test/java/com/fishercoder/firstthousand/_190Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_190Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._190;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _190Test {
-  private static _190.Solution1 solution1;
+  private _190.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _190.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_191Test.java b/src/test/java/com/fishercoder/firstthousand/_191Test.java
index 0a3c71286f..cbc1cefaa3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_191Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_191Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._191;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _191Test {
-    private static _191.Solution1 solution1;
-    private static _191.Solution2 solution2;
-    private static _191.Solution3 solution3;
-    private static _191.Solution4 solution4;
+    private _191.Solution1 solution1;
+    private _191.Solution2 solution2;
+    private _191.Solution3 solution3;
+    private _191.Solution4 solution4;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _191.Solution1();
         solution2 = new _191.Solution2();
         solution3 = new _191.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_198Test.java b/src/test/java/com/fishercoder/firstthousand/_198Test.java
index 03e4477bc6..e0154d370a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_198Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_198Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._198;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _198Test {
-    private static _198.Solution1 solution1;
-    private static _198.Solution2 solution2;
+    private _198.Solution1 solution1;
+    private _198.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _198.Solution1();
         solution2 = new _198.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_199Test.java b/src/test/java/com/fishercoder/firstthousand/_199Test.java
index 5c1897bb05..6cb83364ad 100644
--- a/src/test/java/com/fishercoder/firstthousand/_199Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_199Test.java
@@ -3,20 +3,20 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._199;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _199Test {
-    private static _199.Solution1 solution1;
-    private static _199.Solution2 solution2;
+    private _199.Solution1 solution1;
+    private _199.Solution2 solution2;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _199.Solution1();
         solution2 = new _199.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_19Test.java b/src/test/java/com/fishercoder/firstthousand/_19Test.java
index 14807ae226..0f94159bdd 100644
--- a/src/test/java/com/fishercoder/firstthousand/_19Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_19Test.java
@@ -9,8 +9,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _19Test {
-    private static _19.Solution1 solution1;
-    private static _19.Solution3 solution3;
+    private _19.Solution1 solution1;
+    private _19.Solution3 solution3;
     private static ListNode head;
     private static ListNode expected;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_1Test.java b/src/test/java/com/fishercoder/firstthousand/_1Test.java
index 704e7a68a6..4110faea4c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_1Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_1Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1Test {
-    private static _1.Solution1 solution1;
+    private _1.Solution1 solution1;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_200Test.java b/src/test/java/com/fishercoder/firstthousand/_200Test.java
index 0193e41d96..504c5cd42a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_200Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_200Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._200;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _200Test {
-    private static _200.Solution1 solution1;
-    private static _200.Solution2 solution2;
-    private static char[][] grid;
+    private _200.Solution1 solution1;
+    private _200.Solution2 solution2;
+    private char[][] grid;
 
-    @Before
+    @BeforeEach
     public void setup() {
         solution1 = new _200.Solution1();
         solution2 = new _200.Solution2();
diff --git a/src/test/java/com/fishercoder/firstthousand/_201Test.java b/src/test/java/com/fishercoder/firstthousand/_201Test.java
index 0ab6185661..f12fce970c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_201Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_201Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._201;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _201Test {
-    private static _201.Solution1 solution1;
+    private _201.Solution1 solution1;
     private static int left;
     private static int right;
     private static int actual;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _201.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_202Test.java b/src/test/java/com/fishercoder/firstthousand/_202Test.java
index 5147b7d412..63bc0642e9 100644
--- a/src/test/java/com/fishercoder/firstthousand/_202Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_202Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._202;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _202Test {
-    private static _202.Solution1 solution1;
+    private _202.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _202.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_203Test.java b/src/test/java/com/fishercoder/firstthousand/_203Test.java
index 4b93a19477..afba0284ad 100644
--- a/src/test/java/com/fishercoder/firstthousand/_203Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_203Test.java
@@ -3,18 +3,18 @@
 import com.fishercoder.common.classes.ListNode;
 import com.fishercoder.common.utils.LinkedListUtils;
 import com.fishercoder.solutions.firstthousand._203;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _203Test {
-    private static _203.Solution1 solution1;
+    private _203.Solution1 solution1;
     private static ListNode head;
     private static ListNode expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _203.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_204Test.java b/src/test/java/com/fishercoder/firstthousand/_204Test.java
index efbe40a190..a83f73c63f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_204Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_204Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _204Test {
-    private static _204.Solution1 solution1;
+    private _204.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_206Test.java b/src/test/java/com/fishercoder/firstthousand/_206Test.java
index f1fb9f8056..a75a921c31 100644
--- a/src/test/java/com/fishercoder/firstthousand/_206Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_206Test.java
@@ -3,19 +3,19 @@
 import com.fishercoder.common.classes.ListNode;
 import com.fishercoder.common.utils.LinkedListUtils;
 import com.fishercoder.solutions.firstthousand._206;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _206Test {
-    private static _206.Solution1 solution1;
-    private static _206.Solution2 solution2;
-    private static _206.Solution3 solution3;
+    private _206.Solution1 solution1;
+    private _206.Solution2 solution2;
+    private _206.Solution3 solution3;
     private static ListNode head;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _206.Solution1();
         solution2 = new _206.Solution2();
         solution3 = new _206.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_207Test.java b/src/test/java/com/fishercoder/firstthousand/_207Test.java
index b778ad8b93..ff7aaca555 100644
--- a/src/test/java/com/fishercoder/firstthousand/_207Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_207Test.java
@@ -7,10 +7,10 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _207Test {
-    private static _207.Solution1 solution1;
-    private static _207.Solution2 solution2;
-    private static _207.Solution3 solution3;
-    private static _207.Solution4 solution4;
+    private _207.Solution1 solution1;
+    private _207.Solution2 solution2;
+    private _207.Solution3 solution3;
+    private _207.Solution4 solution4;
     private static int[][] prerequisites;
     private static int numCourses;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_208Test.java b/src/test/java/com/fishercoder/firstthousand/_208Test.java
index e06b832cc8..e46aa29594 100644
--- a/src/test/java/com/fishercoder/firstthousand/_208Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_208Test.java
@@ -1,12 +1,12 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._208;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _208Test {
-    private static _208.Solution1.Trie trie;
+    private _208.Solution1.Trie trie;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_209Test.java b/src/test/java/com/fishercoder/firstthousand/_209Test.java
index 574299d0c7..e0c89a4548 100644
--- a/src/test/java/com/fishercoder/firstthousand/_209Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_209Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._209;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _209Test {
-    private static _209.Solution1 solution1;
+    private _209.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _209.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_20Test.java b/src/test/java/com/fishercoder/firstthousand/_20Test.java
index 636c6d1b62..6b857da163 100644
--- a/src/test/java/com/fishercoder/firstthousand/_20Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_20Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _20Test {
-    private static _20.Solution1 solution1;
+    private _20.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_210Test.java b/src/test/java/com/fishercoder/firstthousand/_210Test.java
index 105a52ed40..aed40155cf 100644
--- a/src/test/java/com/fishercoder/firstthousand/_210Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_210Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _210Test {
-    private static _210.Solution1 solution1;
-    private static _210.Solution2 solution2;
+    private _210.Solution1 solution1;
+    private _210.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_211Test.java b/src/test/java/com/fishercoder/firstthousand/_211Test.java
index 867b29ab4c..ad5d19f95b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_211Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_211Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._211;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _211Test {
-  private static _211.Solution1.WordDictionary wordDictionarySolution1;
+  private _211.Solution1.WordDictionary wordDictionarySolution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     wordDictionarySolution1 = new _211.Solution1.WordDictionary();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_212Test.java b/src/test/java/com/fishercoder/firstthousand/_212Test.java
index b45ca51362..f557147ecf 100644
--- a/src/test/java/com/fishercoder/firstthousand/_212Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_212Test.java
@@ -2,19 +2,19 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._212;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _212Test {
-    private static _212.Solution1 solution1;
-    private static _212.Solution2 solution2;
+    private _212.Solution1 solution1;
+    private _212.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _212.Solution1();
         solution2 = new _212.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_213Test.java b/src/test/java/com/fishercoder/firstthousand/_213Test.java
index abd6f12090..4450fffbe6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_213Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_213Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._213;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _213Test {
-    private static _213.Solution1 solution1;
-    private static _213.Solution2 solution2;
+    private _213.Solution1 solution1;
+    private _213.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _213.Solution1();
         solution2 = new _213.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_215Test.java b/src/test/java/com/fishercoder/firstthousand/_215Test.java
index 97e6ed237d..b590a255e0 100644
--- a/src/test/java/com/fishercoder/firstthousand/_215Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_215Test.java
@@ -1,21 +1,21 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._215;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _215Test {
-    private static _215.Solution1 solution1;
-    private static _215.Solution2 solution2;
-    private static _215.Solution3 solution3;
+    private _215.Solution1 solution1;
+    private _215.Solution2 solution2;
+    private _215.Solution3 solution3;
     private static int k;
     private static int[] nums;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _215.Solution1();
         solution2 = new _215.Solution2();
         solution3 = new _215.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_216Test.java b/src/test/java/com/fishercoder/firstthousand/_216Test.java
index 0bd908203c..276d59d5d6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_216Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_216Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._216;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _216Test {
-    private static _216.Solution1 solution1;
+    private _216.Solution1 solution1;
     private static int k;
     private static int n;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _216.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_217Test.java b/src/test/java/com/fishercoder/firstthousand/_217Test.java
index 0f2d7a1c3a..c131003c23 100644
--- a/src/test/java/com/fishercoder/firstthousand/_217Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_217Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._217;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _217Test {
-    private static _217.Solution1 solution1;
+    private _217.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _217.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_219Test.java b/src/test/java/com/fishercoder/firstthousand/_219Test.java
index dee382e3a1..8bdbf62ad0 100644
--- a/src/test/java/com/fishercoder/firstthousand/_219Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_219Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._219;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _219Test {
-    private static _219.Solution1 solution1;
-    private static _219.Solution2 solution2;
+    private _219.Solution1 solution1;
+    private _219.Solution2 solution2;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _219.Solution1();
         solution2 = new _219.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_21Test.java b/src/test/java/com/fishercoder/firstthousand/_21Test.java
index 7ecece51ec..082fdc07ad 100644
--- a/src/test/java/com/fishercoder/firstthousand/_21Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_21Test.java
@@ -11,8 +11,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _21Test {
-    private static _21.Solution1 solution1;
-    private static _21.Solution2 solution2;
+    private _21.Solution1 solution1;
+    private _21.Solution2 solution2;
     private static ListNode l1;
     private static ListNode l2;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_220Test.java b/src/test/java/com/fishercoder/firstthousand/_220Test.java
index 142b49e4a0..916ebd3a71 100644
--- a/src/test/java/com/fishercoder/firstthousand/_220Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_220Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._220;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _220Test {
-    private static _220.Solution1 solution1;
+    private _220.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _220.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_221Test.java b/src/test/java/com/fishercoder/firstthousand/_221Test.java
index f5fbb09850..aa0c574d83 100644
--- a/src/test/java/com/fishercoder/firstthousand/_221Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_221Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._221;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _221Test {
-    private static _221.Solution1 solution1;
+    private _221.Solution1 solution1;
     private static char[][] matrix;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _221.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_222Test.java b/src/test/java/com/fishercoder/firstthousand/_222Test.java
index f6b444b410..5ac7830304 100644
--- a/src/test/java/com/fishercoder/firstthousand/_222Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_222Test.java
@@ -11,8 +11,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _222Test {
-    private static _222.Solution1 solution1;
-    private static _222.Solution2 solution2;
+    private _222.Solution1 solution1;
+    private _222.Solution2 solution2;
     private static int expected;
     private static TreeNode root;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_224Test.java b/src/test/java/com/fishercoder/firstthousand/_224Test.java
index ff04e1906a..fbd8725126 100644
--- a/src/test/java/com/fishercoder/firstthousand/_224Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_224Test.java
@@ -7,9 +7,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _224Test {
-    private static _224.Solution1 solution1;
-    private static _224.Solution2 solution2;
-    private static _224.Solution3 solution3;
+    private _224.Solution1 solution1;
+    private _224.Solution2 solution2;
+    private _224.Solution3 solution3;
     private static int expected;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_227Test.java b/src/test/java/com/fishercoder/firstthousand/_227Test.java
index 9e75f82537..9f8f1a8987 100644
--- a/src/test/java/com/fishercoder/firstthousand/_227Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_227Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _227Test {
-    private static _227.Solution1 solution1;
+    private _227.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_228Test.java b/src/test/java/com/fishercoder/firstthousand/_228Test.java
index 6ea4fe9aaa..c2f3420bbf 100644
--- a/src/test/java/com/fishercoder/firstthousand/_228Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_228Test.java
@@ -1,21 +1,21 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._228;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _228Test {
-    private static _228.Solution1 solution1;
+    private _228.Solution1 solution1;
     private static List<String> expected;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _228.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_229Test.java b/src/test/java/com/fishercoder/firstthousand/_229Test.java
index d1989c3c86..f3471be0dc 100644
--- a/src/test/java/com/fishercoder/firstthousand/_229Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_229Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._229;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _229Test {
-    private static _229.Solution1 solution1;
+    private _229.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _229.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_22Test.java b/src/test/java/com/fishercoder/firstthousand/_22Test.java
index 6683b3eda5..886989c7e5 100644
--- a/src/test/java/com/fishercoder/firstthousand/_22Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_22Test.java
@@ -6,8 +6,8 @@
 import org.junit.jupiter.api.Test;
 
 public class _22Test {
-    private static _22.Solution1 solution1;
-    private static _22.Solution2 solution2;
+    private _22.Solution1 solution1;
+    private _22.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_230Test.java b/src/test/java/com/fishercoder/firstthousand/_230Test.java
index a5c78a4ca4..03f4d3e9c0 100644
--- a/src/test/java/com/fishercoder/firstthousand/_230Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_230Test.java
@@ -2,21 +2,21 @@
 
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.solutions.firstthousand._230;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 5/19/17.
  */
 public class _230Test {
-    private static _230.Solution1 solution1;
+    private _230.Solution1 solution1;
     private static TreeNode root;
     private static int k;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _230.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_234Test.java b/src/test/java/com/fishercoder/firstthousand/_234Test.java
index f452805d6d..16293c096f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_234Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_234Test.java
@@ -3,18 +3,18 @@
 import com.fishercoder.common.classes.ListNode;
 import com.fishercoder.common.utils.LinkedListUtils;
 import com.fishercoder.solutions.firstthousand._234;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _234Test {
-    private static _234.Solution1 solution1;
-    private static _234.Solution2 solution2;
+    private _234.Solution1 solution1;
+    private _234.Solution2 solution2;
     private static ListNode head;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _234.Solution1();
         solution2 = new _234.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_235Test.java b/src/test/java/com/fishercoder/firstthousand/_235Test.java
index 97df052c86..3c65dadeed 100644
--- a/src/test/java/com/fishercoder/firstthousand/_235Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_235Test.java
@@ -6,19 +6,19 @@
 
 import java.util.Arrays;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _235Test {
-    private static _235.Solution1 solution1;
+    private _235.Solution1 solution1;
     private static TreeNode root;
     private static TreeNode p;
     private static TreeNode q;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _235.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_237Test.java b/src/test/java/com/fishercoder/firstthousand/_237Test.java
index 05be9bace2..d049f6203a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_237Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_237Test.java
@@ -4,17 +4,17 @@
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.common.utils.LinkedListUtils;
 import com.fishercoder.solutions.firstthousand._237;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
 public class _237Test {
-    private static _237.Solution1 solution1;
+    private _237.Solution1 solution1;
     private static ListNode head;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _237.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_238Test.java b/src/test/java/com/fishercoder/firstthousand/_238Test.java
index de58b7d1d3..09db8ac6a1 100644
--- a/src/test/java/com/fishercoder/firstthousand/_238Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_238Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._238;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _238Test {
-    private static _238.Solution1 solution1;
+    private _238.Solution1 solution1;
     private static int[] expected;
     private static int[] actual;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _238.Solution1();
         expected = new int[]{};
         actual = new int[]{};
diff --git a/src/test/java/com/fishercoder/firstthousand/_239Test.java b/src/test/java/com/fishercoder/firstthousand/_239Test.java
index f2d293f94f..65006107cd 100644
--- a/src/test/java/com/fishercoder/firstthousand/_239Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_239Test.java
@@ -1,24 +1,24 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._239;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _239Test {
-    private static _239.Solution1 solution1;
+    private _239.Solution1 solution1;
     private static int[] expected;
     private static int[] actual;
     private static int[] nums;
     private static int k;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _239.Solution1();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         expected = new int[]{};
         actual = new int[]{};
@@ -33,7 +33,7 @@ public void test1() {
         k = 3;
         expected = new int[]{3, 3, 5, 5, 6, 7};
         actual = solution1.maxSlidingWindow(nums, k);
-        Assert.assertArrayEquals(expected, actual);
+        Assertions.assertArrayEquals(expected, actual);
 
     }
 }
diff --git a/src/test/java/com/fishercoder/firstthousand/_23Test.java b/src/test/java/com/fishercoder/firstthousand/_23Test.java
index b143e5ffff..60333e71d0 100644
--- a/src/test/java/com/fishercoder/firstthousand/_23Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_23Test.java
@@ -11,7 +11,7 @@
 import java.util.Arrays;
 
 public class _23Test {
-    private static _23.Solution1 solution1;
+    private _23.Solution1 solution1;
     private static ListNode[] lists;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_240Test.java b/src/test/java/com/fishercoder/firstthousand/_240Test.java
index 4a1a2fe8c0..c01d027812 100644
--- a/src/test/java/com/fishercoder/firstthousand/_240Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_240Test.java
@@ -1,25 +1,25 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._240;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _240Test {
-    private static _240.Solution1 solution1;
+    private _240.Solution1 solution1;
     private static boolean actual;
     private static boolean expected;
     private static int target;
     private static int[][] matrix;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _240.Solution1();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_242Test.java b/src/test/java/com/fishercoder/firstthousand/_242Test.java
index 349a79237a..345c0dd9b3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_242Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_242Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._242;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _242Test {
-    private static _242.Solution1 solution1;
-    private static _242.Solution2 solution2;
-    private static _242.Solution3 solution3;
+    private _242.Solution1 solution1;
+    private _242.Solution2 solution2;
+    private _242.Solution3 solution3;
     private static String s;
     private static String t;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _242.Solution1();
         solution2 = new _242.Solution2();
         solution3 = new _242.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_247Test.java b/src/test/java/com/fishercoder/firstthousand/_247Test.java
index 7dd6ac6e74..c68c03ff23 100644
--- a/src/test/java/com/fishercoder/firstthousand/_247Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_247Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._247;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _247Test {
-  private static _247.Solution1 solution1;
+  private _247.Solution1 solution1;
   private static List<String> expected;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _247.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_249Test.java b/src/test/java/com/fishercoder/firstthousand/_249Test.java
index 5fc30da713..32bd73379c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_249Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_249Test.java
@@ -10,7 +10,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class _249Test {
-    private static _249.Solution1 solution1;
+    private _249.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_24Test.java b/src/test/java/com/fishercoder/firstthousand/_24Test.java
index 601e2c2d52..25ba2513a0 100644
--- a/src/test/java/com/fishercoder/firstthousand/_24Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_24Test.java
@@ -11,8 +11,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _24Test {
-    private static _24.Solution1 solution1;
-    private static _24.Solution2 solution2;
+    private _24.Solution1 solution1;
+    private _24.Solution2 solution2;
     private static ListNode head;
     private static ListNode expected;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_256Test.java b/src/test/java/com/fishercoder/firstthousand/_256Test.java
index 6fdf39876f..56fa79e915 100644
--- a/src/test/java/com/fishercoder/firstthousand/_256Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_256Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _256Test {
-    private static _256.Solution1 solution1;
+    private _256.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_25Test.java b/src/test/java/com/fishercoder/firstthousand/_25Test.java
index 51f60b9a5d..6559bf9c89 100644
--- a/src/test/java/com/fishercoder/firstthousand/_25Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_25Test.java
@@ -9,9 +9,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _25Test {
-    private static _25.Solution1 solution1;
-    private static _25.Solution2 solution2;
-    private static _25.Solution3 solution3;
+    private _25.Solution1 solution1;
+    private _25.Solution2 solution2;
+    private _25.Solution3 solution3;
     private static ListNode expected;
     private static ListNode head;
     private static int k;
diff --git a/src/test/java/com/fishercoder/firstthousand/_264Test.java b/src/test/java/com/fishercoder/firstthousand/_264Test.java
index b4f903814b..67e82ed38d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_264Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_264Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._264;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _264Test {
-    private static _264.Solution1 solution1;
-    private static _264.Solution2 solution2;
+    private _264.Solution1 solution1;
+    private _264.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _264.Solution1();
         solution2 = new _264.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_269Test.java b/src/test/java/com/fishercoder/firstthousand/_269Test.java
index 028131ed34..cbeeb2f737 100644
--- a/src/test/java/com/fishercoder/firstthousand/_269Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_269Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._269;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _269Test {
-    private static _269.Solution1 solution1;
+    private _269.Solution1 solution1;
     private static String[] words;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _269.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_26Test.java b/src/test/java/com/fishercoder/firstthousand/_26Test.java
index c3687215b6..19ecd71ce6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_26Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_26Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _26Test {
-    private static _26.Solution1 solution1;
-    private static _26.Solution2 solution2;
+    private _26.Solution1 solution1;
+    private _26.Solution2 solution2;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_270Test.java b/src/test/java/com/fishercoder/firstthousand/_270Test.java
index 8e626dba40..8fa827135f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_270Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_270Test.java
@@ -11,7 +11,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _270Test {
-    private static _270.Solution1 solution1;
+    private _270.Solution1 solution1;
     private static int expected;
     private static TreeNode root;
     private static double target;
diff --git a/src/test/java/com/fishercoder/firstthousand/_273Test.java b/src/test/java/com/fishercoder/firstthousand/_273Test.java
index 8e462e2dcf..6d2917722f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_273Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_273Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._273;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _273Test {
-    private static _273.Solution1 solution1;
+    private _273.Solution1 solution1;
     private static int num;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _273.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_276Test.java b/src/test/java/com/fishercoder/firstthousand/_276Test.java
index 8130f0832f..beeaf2f8e6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_276Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_276Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _276Test {
-    private static _276.Solution1 solution1;
-    private static _276.Solution2 solution2;
+    private _276.Solution1 solution1;
+    private _276.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_279Test.java b/src/test/java/com/fishercoder/firstthousand/_279Test.java
index 0022b922b5..84708d587a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_279Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_279Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._279;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _279Test {
-    private static _279.Solution1 solution1;
-    private static _279.Solution2 solution2;
-    private static _279.Solution3 solution3;
+    private _279.Solution1 solution1;
+    private _279.Solution2 solution2;
+    private _279.Solution3 solution3;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _279.Solution1();
         solution2 = new _279.Solution2();
         solution3 = new _279.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_27Test.java b/src/test/java/com/fishercoder/firstthousand/_27Test.java
index f6fb73ea90..61e3d9f092 100644
--- a/src/test/java/com/fishercoder/firstthousand/_27Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_27Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _27Test {
-    private static _27.Solution1 solution1;
+    private _27.Solution1 solution1;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_283Test.java b/src/test/java/com/fishercoder/firstthousand/_283Test.java
index 4a7f2c2331..969ee7652c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_283Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_283Test.java
@@ -2,20 +2,20 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._283;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _283Test {
-    private static _283.Solution1 solution1;
-    private static _283.Solution2 solution2;
-    private static _283.Solution3 solution3;
-    private static _283.Solution4 solution4;
+    private _283.Solution1 solution1;
+    private _283.Solution2 solution2;
+    private _283.Solution3 solution3;
+    private _283.Solution4 solution4;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _283.Solution1();
         solution2 = new _283.Solution2();
         solution3 = new _283.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_289Test.java b/src/test/java/com/fishercoder/firstthousand/_289Test.java
index f5ad6574c9..2c0d75923b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_289Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_289Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._289;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _289Test {
-    private static _289.Solution1 solution1;
-    private static int[][] board;
+    private _289.Solution1 solution1;
+    private int[][] board;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _289.Solution1();
     }
 
@@ -30,7 +30,7 @@ public void test1() {
                 {0, 1, 1},
                 {0, 1, 0}
         };
-        assertEquals(expected, board);
+        assertArrayEquals(expected, board);
     }
 
 }
diff --git a/src/test/java/com/fishercoder/firstthousand/_28Test.java b/src/test/java/com/fishercoder/firstthousand/_28Test.java
index d8f7097053..0203cf2b99 100644
--- a/src/test/java/com/fishercoder/firstthousand/_28Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_28Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _28Test {
-    private static _28.Solution1 solution1;
+    private _28.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_291Test.java b/src/test/java/com/fishercoder/firstthousand/_291Test.java
index 49c9f6638d..df7ca436eb 100644
--- a/src/test/java/com/fishercoder/firstthousand/_291Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_291Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._291;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _291Test {
-    private static _291.Solution1 solution1;
+    private _291.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _291.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_294Test.java b/src/test/java/com/fishercoder/firstthousand/_294Test.java
index d78413cebf..85904c1c98 100644
--- a/src/test/java/com/fishercoder/firstthousand/_294Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_294Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._294;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _294Test {
-  private static _294.Solution1 solution1;
+  private _294.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _294.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_295Test.java b/src/test/java/com/fishercoder/firstthousand/_295Test.java
index 8d37bab221..9c36b590de 100644
--- a/src/test/java/com/fishercoder/firstthousand/_295Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_295Test.java
@@ -10,8 +10,8 @@
  * Created by fishercoder on 5/27/17.
  */
 public class _295Test {
-    private static _295.Solution1.MedianFinder solution1;
-    private static _295.Solution2.MedianFinder solution2;
+    private _295.Solution1.MedianFinder solution1;
+    private _295.Solution2.MedianFinder solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_297Test.java b/src/test/java/com/fishercoder/firstthousand/_297Test.java
index 80df69cf67..66aabb0335 100644
--- a/src/test/java/com/fishercoder/firstthousand/_297Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_297Test.java
@@ -3,18 +3,18 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._297;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _297Test {
-    private static _297.Solution1 solution1;
+    private _297.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _297.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_298Test.java b/src/test/java/com/fishercoder/firstthousand/_298Test.java
index 330bc91416..e483848da0 100644
--- a/src/test/java/com/fishercoder/firstthousand/_298Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_298Test.java
@@ -3,15 +3,15 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._298;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _298Test {
-    private static _298.Solution1 solution1;
-    private static _298.Solution2 solution2;
+    private _298.Solution1 solution1;
+    private _298.Solution2 solution2;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_29Test.java b/src/test/java/com/fishercoder/firstthousand/_29Test.java
index 5c1255e482..2960f4fb7a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_29Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_29Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _29Test {
-    private static _29.Solution1 solution1;
-    private static _29.Solution2 solution2;
+    private _29.Solution1 solution1;
+    private _29.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_2Test.java b/src/test/java/com/fishercoder/firstthousand/_2Test.java
index a44ebf68cb..9278e1320d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_2Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_2Test.java
@@ -9,7 +9,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2Test {
-    private static _2.Solution1 solution1;
+    private _2.Solution1 solution1;
     private static ListNode l1;
     private static ListNode l2;
     private static ListNode expected;
diff --git a/src/test/java/com/fishercoder/firstthousand/_300Test.java b/src/test/java/com/fishercoder/firstthousand/_300Test.java
index 52be653cad..f3d6a7f2e3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_300Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_300Test.java
@@ -1,21 +1,21 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._300;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _300Test {
 
-    private static _300.Solution1 solution1;
-    private static _300.Solution2 solution2;
-    private static _300.Solution3 solution3;
-    private static _300.Solution4 solution4;
+    private _300.Solution1 solution1;
+    private _300.Solution2 solution2;
+    private _300.Solution3 solution3;
+    private _300.Solution4 solution4;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _300.Solution1();
         solution2 = new _300.Solution2();
         solution3 = new _300.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_304Test.java b/src/test/java/com/fishercoder/firstthousand/_304Test.java
index 25cc68e037..b6176e8476 100644
--- a/src/test/java/com/fishercoder/firstthousand/_304Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_304Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _304Test {
-    private static _304.Solution1.NumMatrix numMatrix;
+    private _304.Solution1.NumMatrix numMatrix;
     private static int[][] matrix;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_306Test.java b/src/test/java/com/fishercoder/firstthousand/_306Test.java
index 89c3b37f44..6439712e50 100644
--- a/src/test/java/com/fishercoder/firstthousand/_306Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_306Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._306;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _306Test {
-  private static _306.Solution1 solution1;
+  private _306.Solution1 solution1;
   private static String num;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _306.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_30Test.java b/src/test/java/com/fishercoder/firstthousand/_30Test.java
index 45c96b4912..4c009467fc 100644
--- a/src/test/java/com/fishercoder/firstthousand/_30Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_30Test.java
@@ -11,7 +11,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _30Test {
-    private static _30.Solution1 solution1;
+    private _30.Solution1 solution1;
     private static String[] words;
     private static List<Integer> expected;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_312Test.java b/src/test/java/com/fishercoder/firstthousand/_312Test.java
index 2cf4a6ccb0..599ad92377 100644
--- a/src/test/java/com/fishercoder/firstthousand/_312Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_312Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._312;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _312Test {
-    private static _312.Solution1 solution1;
+    private _312.Solution1 solution1;
     private static int[] nums;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _312.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_316Test.java b/src/test/java/com/fishercoder/firstthousand/_316Test.java
index 3133e2d568..420f2ce8b4 100644
--- a/src/test/java/com/fishercoder/firstthousand/_316Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_316Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._316;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _316Test {
-  private static _316.Solution1 solution1;
-  private static _316.Solution2 solution2;
+  private _316.Solution1 solution1;
+  private _316.Solution2 solution2;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _316.Solution1();
     solution2 = new _316.Solution2();
   }
diff --git a/src/test/java/com/fishercoder/firstthousand/_319Test.java b/src/test/java/com/fishercoder/firstthousand/_319Test.java
index 7b5eccfa2f..41bca52064 100644
--- a/src/test/java/com/fishercoder/firstthousand/_319Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_319Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._319;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _319Test {
-  private static _319.Solution1 solution1;
+  private _319.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _319.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_31Test.java b/src/test/java/com/fishercoder/firstthousand/_31Test.java
index 73cdda4735..7b355cada2 100644
--- a/src/test/java/com/fishercoder/firstthousand/_31Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_31Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _31Test {
-    private static _31.Solution1 solution1;
+    private _31.Solution1 solution1;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_320Test.java b/src/test/java/com/fishercoder/firstthousand/_320Test.java
index 9040066774..b6411a97ae 100644
--- a/src/test/java/com/fishercoder/firstthousand/_320Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_320Test.java
@@ -1,29 +1,28 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._320;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class _320Test {
-  private static _320.Solution1 solution1;
+  private _320.Solution1 solution1;
   private static List<String> expected;
   private static List<String> actual;
   private static String word;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _320.Solution1();
   }
 
-  @Before
-  public void setupForEachTest() {
+  @BeforeEach
+    public void setupForEachTest() {
     expected = new ArrayList<>();
     actual = new ArrayList<>();
   }
diff --git a/src/test/java/com/fishercoder/firstthousand/_325Test.java b/src/test/java/com/fishercoder/firstthousand/_325Test.java
index 31cfc073ac..ca89615c28 100644
--- a/src/test/java/com/fishercoder/firstthousand/_325Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_325Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._325;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _325Test {
-    private static _325.Solution1 solution1;
+    private _325.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _325.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_326Test.java b/src/test/java/com/fishercoder/firstthousand/_326Test.java
index eae4427afe..a7eef368a1 100644
--- a/src/test/java/com/fishercoder/firstthousand/_326Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_326Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._326;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _326Test {
-    private static _326.Solution1 solution1;
-    private static _326.Solution2 solution2;
-    private static _326.Solution3 solution3;
+    private _326.Solution1 solution1;
+    private _326.Solution2 solution2;
+    private _326.Solution3 solution3;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _326.Solution1();
         solution2 = new _326.Solution2();
         solution3 = new _326.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_327Test.java b/src/test/java/com/fishercoder/firstthousand/_327Test.java
index ba5b533486..9efc55b4d4 100644
--- a/src/test/java/com/fishercoder/firstthousand/_327Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_327Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._327;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _327Test {
-    private static _327.Solution1 solution1;
-    private static _327.Solution2 solution2;
+    private _327.Solution1 solution1;
+    private _327.Solution2 solution2;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _327.Solution1();
         solution2 = new _327.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_328Test.java b/src/test/java/com/fishercoder/firstthousand/_328Test.java
index 13dc1714c0..8d0f632252 100644
--- a/src/test/java/com/fishercoder/firstthousand/_328Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_328Test.java
@@ -2,18 +2,18 @@
 
 import com.fishercoder.common.classes.ListNode;
 import com.fishercoder.solutions.firstthousand._328;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _328Test {
-  private static _328.Solution1 solution1;
+  private _328.Solution1 solution1;
   private static ListNode expected;
   private static ListNode node;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _328.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_32Test.java b/src/test/java/com/fishercoder/firstthousand/_32Test.java
index a8496b88e9..dd6191cfa9 100644
--- a/src/test/java/com/fishercoder/firstthousand/_32Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_32Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _32Test {
-    private static _32.Solution1 solution1;
-    private static _32.Solution2 solution2;
+    private _32.Solution1 solution1;
+    private _32.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_330Test.java b/src/test/java/com/fishercoder/firstthousand/_330Test.java
index 9632357734..e4798a9b0d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_330Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_330Test.java
@@ -1,21 +1,21 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._330;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _330Test {
-  private static _330.Solution1 solution1;
+  private _330.Solution1 solution1;
   private static int[] nums;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _330.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_331Test.java b/src/test/java/com/fishercoder/firstthousand/_331Test.java
index 5005102cb9..7133346b64 100644
--- a/src/test/java/com/fishercoder/firstthousand/_331Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_331Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._331;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _331Test {
-  private static _331.Solution1 solution1;
+  private _331.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _331.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_332Test.java b/src/test/java/com/fishercoder/firstthousand/_332Test.java
index 63ec4100e6..8a24ac51f1 100644
--- a/src/test/java/com/fishercoder/firstthousand/_332Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_332Test.java
@@ -2,20 +2,20 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._332;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 public class _332Test {
-    private static _332.Solution1 solution1;
+    private _332.Solution1 solution1;
     private static List<List<String>> tickets;
     private static List<String> expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _332.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_334Test.java b/src/test/java/com/fishercoder/firstthousand/_334Test.java
index 17b0edd928..3b80a5b56a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_334Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_334Test.java
@@ -8,8 +8,8 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class _334Test {
-    private static _334.Solution1 solution1;
-    private static _334.Solution2 solution2;
+    private _334.Solution1 solution1;
+    private _334.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_337Test.java b/src/test/java/com/fishercoder/firstthousand/_337Test.java
index 2f24a0a5b1..b8f0d21a11 100644
--- a/src/test/java/com/fishercoder/firstthousand/_337Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_337Test.java
@@ -10,8 +10,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _337Test {
-    private static _337.Solution1 solution1;
-    private static _337.Solution2 solution2;
+    private _337.Solution1 solution1;
+    private _337.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_338Test.java b/src/test/java/com/fishercoder/firstthousand/_338Test.java
index dc8bc82452..cced0e775d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_338Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_338Test.java
@@ -2,18 +2,18 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._338;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _338Test {
-  private static _338.Solution1 test;
+  private _338.Solution1 test;
   private static int[] expected;
   private static int[] actual;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     test = new _338.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_33Test.java b/src/test/java/com/fishercoder/firstthousand/_33Test.java
index aeeecb814d..e012dfa3ca 100644
--- a/src/test/java/com/fishercoder/firstthousand/_33Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_33Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _33Test {
-    private static _33.Solution1 solution1;
+    private _33.Solution1 solution1;
     private static int[] nums;
     private static int expected;
     private static int target;
diff --git a/src/test/java/com/fishercoder/firstthousand/_340Test.java b/src/test/java/com/fishercoder/firstthousand/_340Test.java
index 770cdc069b..40b42283b9 100644
--- a/src/test/java/com/fishercoder/firstthousand/_340Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_340Test.java
@@ -1,21 +1,21 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._340;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _340Test {
-    private static _340.Solution1 solution1;
-    private static _340.Solution2 solution2;
-    private static _340.Solution3 solution3;
+    private _340.Solution1 solution1;
+    private _340.Solution2 solution2;
+    private _340.Solution3 solution3;
     private static String s;
     private static int k;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _340.Solution1();
         solution2 = new _340.Solution2();
         solution3 = new _340.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_341Test.java b/src/test/java/com/fishercoder/firstthousand/_341Test.java
index 21e99bfd61..7a7b356d88 100644
--- a/src/test/java/com/fishercoder/firstthousand/_341Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_341Test.java
@@ -2,21 +2,21 @@
 
 import com.fishercoder.common.classes.NestedInteger;
 import com.fishercoder.solutions.firstthousand._341;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _341Test {
-  private static _341.Solution1 test;
+  private _341.Solution1 test;
   private static List<NestedInteger> nestedList;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     test = new _341.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_347Test.java b/src/test/java/com/fishercoder/firstthousand/_347Test.java
index 72f315a04c..9dc4c2a159 100644
--- a/src/test/java/com/fishercoder/firstthousand/_347Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_347Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _347Test {
-    private static _347.Solution1 solution1;
-    private static _347.Solution2 solution2;
+    private _347.Solution1 solution1;
+    private _347.Solution2 solution2;
     private static int[] nums;
     private static int[] expected;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_348Test.java b/src/test/java/com/fishercoder/firstthousand/_348Test.java
index f2dc0faf42..44b04d9cce 100644
--- a/src/test/java/com/fishercoder/firstthousand/_348Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_348Test.java
@@ -1,9 +1,9 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._348;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _348Test {
   @Test
diff --git a/src/test/java/com/fishercoder/firstthousand/_349Test.java b/src/test/java/com/fishercoder/firstthousand/_349Test.java
index df39687284..4fe5520634 100644
--- a/src/test/java/com/fishercoder/firstthousand/_349Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_349Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._349;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _349Test {
-    private static _349.Solution1 solution1;
-    private static _349.Solution2 solution2;
-    private static _349.Solution3 solution3;
+    private _349.Solution1 solution1;
+    private _349.Solution2 solution2;
+    private _349.Solution3 solution3;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _349.Solution1();
         solution2 = new _349.Solution2();
         solution3 = new _349.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_34Test.java b/src/test/java/com/fishercoder/firstthousand/_34Test.java
index 9219792cc6..c333101ae6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_34Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_34Test.java
@@ -7,9 +7,9 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _34Test {
-    private static _34.Solution1 solution1;
-    private static _34.Solution2 solution2;
-    private static _34.Solution3 solution3;
+    private _34.Solution1 solution1;
+    private _34.Solution2 solution2;
+    private _34.Solution3 solution3;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_350Test.java b/src/test/java/com/fishercoder/firstthousand/_350Test.java
index 984e1c5a40..7b4eab94c3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_350Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_350Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _350Test {
-    private static _350.Solution1 solution1;
-    private static _350.Solution2 solution2;
+    private _350.Solution1 solution1;
+    private _350.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_351Test.java b/src/test/java/com/fishercoder/firstthousand/_351Test.java
index ca86c8b64e..609847eb22 100644
--- a/src/test/java/com/fishercoder/firstthousand/_351Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_351Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _351Test {
-    private static _351.Solution1 solution1;
+    private _351.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_352Test.java b/src/test/java/com/fishercoder/firstthousand/_352Test.java
index f4abb1ed56..a034a7433a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_352Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_352Test.java
@@ -3,17 +3,17 @@
 import com.fishercoder.common.classes.Interval;
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._352;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
 public class _352Test {
-  private static _352.Solution1.SummaryRanges test;
+  private _352.Solution1.SummaryRanges test;
   private static List<Interval> actual;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     test = new _352.Solution1.SummaryRanges();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_355Test.java b/src/test/java/com/fishercoder/firstthousand/_355Test.java
index e8307928f2..d2373756a7 100644
--- a/src/test/java/com/fishercoder/firstthousand/_355Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_355Test.java
@@ -1,28 +1,28 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._355;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 5/10/17.
  */
 public class _355Test {
-    private static _355.Solution1.Twitter solution1Twitter;
-    private static _355.Solution2.Twitter solution2Twitter;
+    private _355.Solution1.Twitter solution1Twitter;
+    private _355.Solution2.Twitter solution2Twitter;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1Twitter = new _355.Solution1.Twitter();
         solution2Twitter = new _355.Solution2.Twitter();
     }
 
-    @Before
+    @BeforeEach
     public void cleanUp() {
         solution1Twitter = new _355.Solution1.Twitter();
         solution2Twitter = new _355.Solution2.Twitter();
diff --git a/src/test/java/com/fishercoder/firstthousand/_356Test.java b/src/test/java/com/fishercoder/firstthousand/_356Test.java
index a80cc977fa..505680b750 100644
--- a/src/test/java/com/fishercoder/firstthousand/_356Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_356Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._356;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _356Test {
-  private static _356.Solution1 solution1;
+  private _356.Solution1 solution1;
   private static int[][] points;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _356.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_358Test.java b/src/test/java/com/fishercoder/firstthousand/_358Test.java
index 47bb47f80c..8d3725ab92 100644
--- a/src/test/java/com/fishercoder/firstthousand/_358Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_358Test.java
@@ -1,15 +1,15 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._358;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _358Test {
 
-    private static _358.Solution1 solution1;
+    private _358.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _358.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_35Test.java b/src/test/java/com/fishercoder/firstthousand/_35Test.java
index 15c49d9441..2baab3bc07 100644
--- a/src/test/java/com/fishercoder/firstthousand/_35Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_35Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _35Test {
-    private static _35.Solution1 solution1;
+    private _35.Solution1 solution1;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_362Test.java b/src/test/java/com/fishercoder/firstthousand/_362Test.java
index 1e4c4e7731..aae938ab92 100644
--- a/src/test/java/com/fishercoder/firstthousand/_362Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_362Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._362;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _362Test {
-    private static _362.Solution1.HitCounter hitCounter;
+    private _362.Solution1.HitCounter hitCounter;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         hitCounter = new _362.Solution1.HitCounter();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_368Test.java b/src/test/java/com/fishercoder/firstthousand/_368Test.java
index 9f470535ca..7b3d7d6368 100644
--- a/src/test/java/com/fishercoder/firstthousand/_368Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_368Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._368;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _368Test {
-    private static _368.Solution1 solution1;
-    private static _368.Solution2 solution2;
+    private _368.Solution1 solution1;
+    private _368.Solution2 solution2;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _368.Solution1();
         solution2 = new _368.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_369Test.java b/src/test/java/com/fishercoder/firstthousand/_369Test.java
index 84b49b26aa..137bb84c23 100644
--- a/src/test/java/com/fishercoder/firstthousand/_369Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_369Test.java
@@ -3,19 +3,19 @@
 import com.fishercoder.common.classes.ListNode;
 import com.fishercoder.common.utils.LinkedListUtils;
 import com.fishercoder.solutions.firstthousand._369;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _369Test {
 
-    private static _369.Solution2 solution2;
+    private _369.Solution2 solution2;
     private static ListNode head;
     private static ListNode expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution2 = new _369.Solution2();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_36Test.java b/src/test/java/com/fishercoder/firstthousand/_36Test.java
index 089be350ad..d7745be669 100644
--- a/src/test/java/com/fishercoder/firstthousand/_36Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_36Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _36Test {
-    private static _36.Solution1 solution1;
+    private _36.Solution1 solution1;
     private static char[][] board;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_370Test.java b/src/test/java/com/fishercoder/firstthousand/_370Test.java
index 8c063112e7..00a33b11be 100644
--- a/src/test/java/com/fishercoder/firstthousand/_370Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_370Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._370;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _370Test {
-    private static _370.Solution1 solution1;
+    private _370.Solution1 solution1;
     private static int[][] updates;
     private static int length;
     private static int[] expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _370.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_372Test.java b/src/test/java/com/fishercoder/firstthousand/_372Test.java
index cfd781275d..af17f734e5 100644
--- a/src/test/java/com/fishercoder/firstthousand/_372Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_372Test.java
@@ -1,26 +1,26 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._372;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _372Test {
-  private static _372.Solution1 solution1;
+  private _372.Solution1 solution1;
   private static int expected;
   private static int actual;
   private static int a;
   private static int[] b;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _372.Solution1();
   }
 
-  @Before
-  public void setupForEachTest() {
+  @BeforeEach
+    public void setupForEachTest() {
     expected = 0;
     actual = 0;
     a = 0;
diff --git a/src/test/java/com/fishercoder/firstthousand/_376Test.java b/src/test/java/com/fishercoder/firstthousand/_376Test.java
index 7d4bc0bd78..2453178d8b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_376Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_376Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._376;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _376Test {
-    private static _376.Solution1 solution1;
+    private _376.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _376.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_377Test.java b/src/test/java/com/fishercoder/firstthousand/_377Test.java
index 8a8941d23f..d47bbe5a20 100644
--- a/src/test/java/com/fishercoder/firstthousand/_377Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_377Test.java
@@ -1,29 +1,29 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._377;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _377Test {
-    private static _377.Solution1 solution1;
-    private static _377.Solution2 solution2;
-    private static _377.Solution3 solution3;
-    private static _377.Solution4 solution4;
+    private _377.Solution1 solution1;
+    private _377.Solution2 solution2;
+    private _377.Solution3 solution3;
+    private _377.Solution4 solution4;
     private static int[] nums;
     private static int target;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _377.Solution1();
         solution2 = new _377.Solution2();
         solution3 = new _377.Solution3();
     }
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         //always have to reset these global variables before using it again
         solution2.count = 0;
diff --git a/src/test/java/com/fishercoder/firstthousand/_378Test.java b/src/test/java/com/fishercoder/firstthousand/_378Test.java
index 517a00e83c..e5c109268c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_378Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_378Test.java
@@ -2,19 +2,19 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._378;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _378Test {
-    private static _378.Solution1 solution1;
-    private static _378.Solution2 solution2;
-    private static _378.Solution3 solution3;
+    private _378.Solution1 solution1;
+    private _378.Solution2 solution2;
+    private _378.Solution3 solution3;
     private static int[][] matrix;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _378.Solution1();
         solution2 = new _378.Solution2();
         solution3 = new _378.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_37Test.java b/src/test/java/com/fishercoder/firstthousand/_37Test.java
index 7ffc950100..570cb2a1d0 100644
--- a/src/test/java/com/fishercoder/firstthousand/_37Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_37Test.java
@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.Test;
 
 public class _37Test {
-    private static _37.Solution1 solution1;
+    private _37.Solution1 solution1;
     private static char[][] board;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_381Test.java b/src/test/java/com/fishercoder/firstthousand/_381Test.java
index 682a974078..01e9f3cb32 100644
--- a/src/test/java/com/fishercoder/firstthousand/_381Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_381Test.java
@@ -8,7 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class _381Test {
-    private static _381.Solution1.RandomizedCollection randomizedCollection;
+    private _381.Solution1.RandomizedCollection randomizedCollection;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_384Test.java b/src/test/java/com/fishercoder/firstthousand/_384Test.java
index 7db3f1963e..36b8c833e5 100644
--- a/src/test/java/com/fishercoder/firstthousand/_384Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_384Test.java
@@ -2,10 +2,10 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._384;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class _384Test {
-    private static _384.Solution2 solution2;
+    private _384.Solution2 solution2;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_385Test.java b/src/test/java/com/fishercoder/firstthousand/_385Test.java
index d8d2855ac3..9bb3df5be8 100644
--- a/src/test/java/com/fishercoder/firstthousand/_385Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_385Test.java
@@ -1,14 +1,14 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._385;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _385Test {
-  private static _385.Solution1 solution1;
+  private _385.Solution1 solution1;
 
-  @BeforeClass
-  public static void setUp() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _385.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_388Test.java b/src/test/java/com/fishercoder/firstthousand/_388Test.java
index d96a4a6157..c5f59c7d95 100644
--- a/src/test/java/com/fishercoder/firstthousand/_388Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_388Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._388;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _388Test {
-  private static _388.Solution1 solution1;
+  private _388.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _388.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_38Test.java b/src/test/java/com/fishercoder/firstthousand/_38Test.java
index 966848cc74..7594d20ace 100644
--- a/src/test/java/com/fishercoder/firstthousand/_38Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_38Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _38Test {
-    private static _38.Solution1 solution1;
+    private _38.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_392Test.java b/src/test/java/com/fishercoder/firstthousand/_392Test.java
index 9f871576ad..825bcf3ca6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_392Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_392Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._392;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _392Test {
-  private static _392.Solution1 solution1;
+  private _392.Solution1 solution1;
   private static String s;
   private static String t;
   private static boolean expected;
   private static boolean actual;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _392.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_393Test.java b/src/test/java/com/fishercoder/firstthousand/_393Test.java
index d1c3a30bda..cad8a9b622 100644
--- a/src/test/java/com/fishercoder/firstthousand/_393Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_393Test.java
@@ -1,25 +1,25 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._393;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _393Test {
-  private static _393.Solution1 solution1;
+  private _393.Solution1 solution1;
   private static boolean expected;
   private static boolean actual;
   private static int[] data;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _393.Solution1();
   }
 
   @Test
-  @Ignore
+  @Disabled
   public void test1() {
     data = new int[] {197, 130, 1};
     expected = true;
diff --git a/src/test/java/com/fishercoder/firstthousand/_394Test.java b/src/test/java/com/fishercoder/firstthousand/_394Test.java
index 9096997840..9e10269f1e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_394Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_394Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._394;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by varunu28 on 1/08/19.
  */
 
 public class _394Test {
-  private static _394.Solution1 test;
+  private _394.Solution1 test;
 
-  @BeforeClass
-  public static void setUp() {
+  @BeforeEach
+    public void setUp() {
     test = new _394.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_395Test.java b/src/test/java/com/fishercoder/firstthousand/_395Test.java
index eb3cf13b85..c407d918ed 100644
--- a/src/test/java/com/fishercoder/firstthousand/_395Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_395Test.java
@@ -1,21 +1,21 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._395;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _395Test {
 
-    private static _395.Solution1 solution1;
-    private static _395.Solution2 solution2;
+    private _395.Solution1 solution1;
+    private _395.Solution2 solution2;
     private static String s;
     private static int k;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _395.Solution1();
         solution2 = new _395.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_396Test.java b/src/test/java/com/fishercoder/firstthousand/_396Test.java
index 6b1069463c..a8278b1425 100644
--- a/src/test/java/com/fishercoder/firstthousand/_396Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_396Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._396;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _396Test {
-    private static _396.Solution1 solution1;
-    private static _396.Solution2 solution2;
+    private _396.Solution1 solution1;
+    private _396.Solution2 solution2;
     private static int[] A;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _396.Solution1();
         solution2 = new _396.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_397Test.java b/src/test/java/com/fishercoder/firstthousand/_397Test.java
index b1501833f5..2d1a7dfe8b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_397Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_397Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._397;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _397Test {
-  private static _397.Solution1 solution1;
+  private _397.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _397.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_39Test.java b/src/test/java/com/fishercoder/firstthousand/_39Test.java
index baa4b1497a..74a5d45fa3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_39Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_39Test.java
@@ -11,7 +11,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _39Test {
-    private static _39.Solution1 solution1;
+    private _39.Solution1 solution1;
     private static int[] candidates;
     private static List<List<Integer>> expected;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_3Test.java b/src/test/java/com/fishercoder/firstthousand/_3Test.java
index bb3935cd6c..f319112547 100644
--- a/src/test/java/com/fishercoder/firstthousand/_3Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_3Test.java
@@ -7,12 +7,12 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3Test {
-    private static _3.Solution1 solution1;
-    private static _3.Solution2 solution2;
-    private static _3.Solution3 solution3;
-    private static _3.Solution4 solution4;
-    private static _3.Solution5 solution5;
-    private static _3.Solution6 solution6;
+    private _3.Solution1 solution1;
+    private _3.Solution2 solution2;
+    private _3.Solution3 solution3;
+    private _3.Solution4 solution4;
+    private _3.Solution5 solution5;
+    private _3.Solution6 solution6;
     private static int expected;
     private static String s;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_400Test.java b/src/test/java/com/fishercoder/firstthousand/_400Test.java
index b9b2f47c55..ec075c944c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_400Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_400Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._400;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _400Test {
-  private static _400.Solution1 solution1;
+  private _400.Solution1 solution1;
   private static int expected;
   private static int actual;
   private static int n;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _400.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_401Test.java b/src/test/java/com/fishercoder/firstthousand/_401Test.java
index f999c45cd6..83d651586a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_401Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_401Test.java
@@ -2,16 +2,16 @@
 
 import com.fishercoder.solutions.firstthousand._401;
 import java.util.Arrays;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _401Test {
-  private static _401.Solution1 solution1;
+  private _401.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _401.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_402Test.java b/src/test/java/com/fishercoder/firstthousand/_402Test.java
index 19f1ac4523..6a455d3106 100644
--- a/src/test/java/com/fishercoder/firstthousand/_402Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_402Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._402;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _402Test {
-  private static _402.Solution1 solution1;
+  private _402.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _402.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_404Test.java b/src/test/java/com/fishercoder/firstthousand/_404Test.java
index 45c69a72d5..29acaf14e9 100644
--- a/src/test/java/com/fishercoder/firstthousand/_404Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_404Test.java
@@ -3,22 +3,22 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._404;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _404Test {
-    private static _404.Solution1 solution1;
-    private static _404.Solution2 solution2;
-    private static _404.Solution3 solution3;
+    private _404.Solution1 solution1;
+    private _404.Solution2 solution2;
+    private _404.Solution3 solution3;
     private static TreeNode root;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _404.Solution1();
         solution2 = new _404.Solution2();
         solution3 = new _404.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_406Test.java b/src/test/java/com/fishercoder/firstthousand/_406Test.java
index f40943dbb5..e6cc90fd84 100644
--- a/src/test/java/com/fishercoder/firstthousand/_406Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_406Test.java
@@ -2,16 +2,16 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._406;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _406Test {
-  private static _406.Solution1 solution1;
+  private _406.Solution1 solution1;
   private static int[][] people;
   private static int[][] actual;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _406.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_408Test.java b/src/test/java/com/fishercoder/firstthousand/_408Test.java
index 7b6af41fe3..774012cc1a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_408Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_408Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _408Test {
-    private static _408.Solution1 solution1;
-    private static _408.Solution2 solution2;
+    private _408.Solution1 solution1;
+    private _408.Solution2 solution2;
     private static Boolean expected;
     private static Boolean actual;
     private static String word;
diff --git a/src/test/java/com/fishercoder/firstthousand/_409Test.java b/src/test/java/com/fishercoder/firstthousand/_409Test.java
index efb4a015ce..4e355197f5 100644
--- a/src/test/java/com/fishercoder/firstthousand/_409Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_409Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._409;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _409Test {
-    private static _409.Solution1 solution1;
-    private static _409.Solution2 solution2;
+    private _409.Solution1 solution1;
+    private _409.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _409.Solution1();
         solution2 = new _409.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_40Test.java b/src/test/java/com/fishercoder/firstthousand/_40Test.java
index 90570aaa40..02671b102c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_40Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_40Test.java
@@ -10,7 +10,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _40Test {
-    private static _40.Solution1 solution1;
+    private _40.Solution1 solution1;
     private static int[] candidates;
     private static int target;
     private static List<List<Integer>> expected;
diff --git a/src/test/java/com/fishercoder/firstthousand/_410Test.java b/src/test/java/com/fishercoder/firstthousand/_410Test.java
index 54c3039cb8..03d41d0523 100644
--- a/src/test/java/com/fishercoder/firstthousand/_410Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_410Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._410;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _410Test {
-  private static _410.Solution1 test;
+  private _410.Solution1 test;
   private static int[] nums;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     test = new _410.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_415Test.java b/src/test/java/com/fishercoder/firstthousand/_415Test.java
index 2dbd0ef205..01de36da58 100644
--- a/src/test/java/com/fishercoder/firstthousand/_415Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_415Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _415Test {
-    private static _415.Solution1 solution1;
-    private static _415.Solution2 solution2;
+    private _415.Solution1 solution1;
+    private _415.Solution2 solution2;
     private static String expected;
     private static String actual;
     private static String num1;
diff --git a/src/test/java/com/fishercoder/firstthousand/_416Test.java b/src/test/java/com/fishercoder/firstthousand/_416Test.java
index 7611a90e4d..50afa2794c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_416Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_416Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._416;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _416Test {
-    private static _416.Solution1 solution1;
+    private _416.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _416.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_417Test.java b/src/test/java/com/fishercoder/firstthousand/_417Test.java
index fe52f85502..529dcded0b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_417Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_417Test.java
@@ -2,15 +2,15 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._417;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _417Test {
-    private static _417.Solution1 solution1;
+    private _417.Solution1 solution1;
     private static int[][] matrix;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _417.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_418Test.java b/src/test/java/com/fishercoder/firstthousand/_418Test.java
index 7e829959b7..ee93019772 100644
--- a/src/test/java/com/fishercoder/firstthousand/_418Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_418Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._418;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _418Test {
-    private static _418.Solution1 test;
+    private _418.Solution1 test;
     private static String[] sentence;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         test = new _418.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_41Test.java b/src/test/java/com/fishercoder/firstthousand/_41Test.java
index 83f6229d9f..32bfa89133 100644
--- a/src/test/java/com/fishercoder/firstthousand/_41Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_41Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _41Test {
-    private static _41.Solution1 solution1;
+    private _41.Solution1 solution1;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_421Test.java b/src/test/java/com/fishercoder/firstthousand/_421Test.java
index d471123837..d6f6e80dcd 100644
--- a/src/test/java/com/fishercoder/firstthousand/_421Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_421Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._421;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _421Test {
-    private static _421.Solution1 solution1;
+    private _421.Solution1 solution1;
     private static int expected;
     private static int actual;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _421.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_422Test.java b/src/test/java/com/fishercoder/firstthousand/_422Test.java
index 8f22d161f6..a906a8d570 100644
--- a/src/test/java/com/fishercoder/firstthousand/_422Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_422Test.java
@@ -1,29 +1,29 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._422;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _422Test {
-  private static _422.Solution1 test;
+  private _422.Solution1 test;
   private static boolean expected;
   private static boolean actual;
   private static List<String> words;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     test = new _422.Solution1();
   }
 
-  @Before
-  public void setupForEachTest() {
+  @BeforeEach
+    public void setupForEachTest() {
   }
 
   @Test
diff --git a/src/test/java/com/fishercoder/firstthousand/_423Test.java b/src/test/java/com/fishercoder/firstthousand/_423Test.java
index 48e4e85e59..d4b2ef20ac 100644
--- a/src/test/java/com/fishercoder/firstthousand/_423Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_423Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._423;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _423Test {
-    private static _423.Solution1 solution1;
+    private _423.Solution1 solution1;
     private static String expected;
     private static String actual;
     private static String s;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _423.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_424Test.java b/src/test/java/com/fishercoder/firstthousand/_424Test.java
index 61a03600e5..5e97637a53 100644
--- a/src/test/java/com/fishercoder/firstthousand/_424Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_424Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._424;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _424Test {
-    private static _424.Solution1 solution1;
-    private static _424.Solution2 solution2;
+    private _424.Solution1 solution1;
+    private _424.Solution2 solution2;
     private static String s;
     private static int k;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _424.Solution1();
         solution2 = new _424.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_425Test.java b/src/test/java/com/fishercoder/firstthousand/_425Test.java
index 3aade14695..571753284a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_425Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_425Test.java
@@ -2,17 +2,17 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._425;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
 public class _425Test {
-    private static _425.Solution1 solution1;
+    private _425.Solution1 solution1;
     private static String[] words;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _425.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_426Test.java b/src/test/java/com/fishercoder/firstthousand/_426Test.java
index 5be1881901..5b7955d753 100644
--- a/src/test/java/com/fishercoder/firstthousand/_426Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_426Test.java
@@ -5,7 +5,7 @@
 import org.junit.jupiter.api.Test;
 
 public class _426Test {
-    private static _426.Solution1 solution1;
+    private _426.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_429Test.java b/src/test/java/com/fishercoder/firstthousand/_429Test.java
index 2489b23043..d145c3d843 100644
--- a/src/test/java/com/fishercoder/firstthousand/_429Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_429Test.java
@@ -6,18 +6,18 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _429Test {
-  private static _429.Solution1 solution1;
+  private _429.Solution1 solution1;
   private static Node root;
   private static List<List<Integer>> expected;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _429.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_42Test.java b/src/test/java/com/fishercoder/firstthousand/_42Test.java
index c5d5b821a8..4095214344 100644
--- a/src/test/java/com/fishercoder/firstthousand/_42Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_42Test.java
@@ -10,7 +10,7 @@
  * Created by fishercoder on 5/13/17.
  */
 public class _42Test {
-    private static _42.Solution1 solution1;
+    private _42.Solution1 solution1;
     private static int[] height;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_433Test.java b/src/test/java/com/fishercoder/firstthousand/_433Test.java
index 807ccb12f7..06486c06e8 100644
--- a/src/test/java/com/fishercoder/firstthousand/_433Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_433Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _433Test {
-    private static _433.Solution1 solution1;
+    private _433.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_434Test.java b/src/test/java/com/fishercoder/firstthousand/_434Test.java
index c50203ca68..353ea57dc2 100644
--- a/src/test/java/com/fishercoder/firstthousand/_434Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_434Test.java
@@ -1,25 +1,25 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._434;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _434Test {
-  private static _434.Solution1 solution1;
+  private _434.Solution1 solution1;
   private static int expected;
   private static int actual;
   private static String s;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _434.Solution1();
   }
 
-  @Before
-  public void setupForEachTest() {
+  @BeforeEach
+    public void setupForEachTest() {
     expected = 0;
     actual = 0;
   }
diff --git a/src/test/java/com/fishercoder/firstthousand/_435Test.java b/src/test/java/com/fishercoder/firstthousand/_435Test.java
index e4e072f131..0503662e6e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_435Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_435Test.java
@@ -2,17 +2,17 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._435;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _435Test {
-    private static _435.Solution1 solution1;
-    private static _435.Solution2 solution2;
+    private _435.Solution1 solution1;
+    private _435.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _435.Solution1();
         solution2 = new _435.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_436Test.java b/src/test/java/com/fishercoder/firstthousand/_436Test.java
index 24002d1c77..c32b0c2a63 100644
--- a/src/test/java/com/fishercoder/firstthousand/_436Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_436Test.java
@@ -1,14 +1,14 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._436;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _436Test {
-    private static _436.Solution1 solution1;
+    private _436.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _436.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_439Test.java b/src/test/java/com/fishercoder/firstthousand/_439Test.java
index 776e438fa0..962df67f43 100644
--- a/src/test/java/com/fishercoder/firstthousand/_439Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_439Test.java
@@ -1,21 +1,21 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._439;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 5/18/17.
  */
 public class _439Test {
-  private static _439.Solution1 solution1;
+  private _439.Solution1 solution1;
   private static String expression;
   private static String expected;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _439.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_43Test.java b/src/test/java/com/fishercoder/firstthousand/_43Test.java
index 6d62f773ed..11c23c760d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_43Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_43Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _43Test {
-    private static _43.Solution1 solution1;
-    private static _43.Solution2 solution2;
+    private _43.Solution1 solution1;
+    private _43.Solution2 solution2;
     private static String expected;
     private static String num1;
     private static String num2;
diff --git a/src/test/java/com/fishercoder/firstthousand/_441Test.java b/src/test/java/com/fishercoder/firstthousand/_441Test.java
index c4ecee1f4f..f2b78eb0f0 100644
--- a/src/test/java/com/fishercoder/firstthousand/_441Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_441Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._441;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _441Test {
-    private static _441.Solution1 solution1;
+    private _441.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _441.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_442Test.java b/src/test/java/com/fishercoder/firstthousand/_442Test.java
index 18c7ee23ba..33e3695044 100644
--- a/src/test/java/com/fishercoder/firstthousand/_442Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_442Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._442;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _442Test {
-    private static _442.Solution1 solution1;
-    private static _442.Solution2 solution2;
+    private _442.Solution1 solution1;
+    private _442.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _442.Solution1();
         solution2 = new _442.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_443Test.java b/src/test/java/com/fishercoder/firstthousand/_443Test.java
index aa9d0dec51..c0bec55a47 100644
--- a/src/test/java/com/fishercoder/firstthousand/_443Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_443Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._443;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _443Test {
-    private static _443.Solution1 solution1;
+    private _443.Solution1 solution1;
     private static char[] chars;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _443.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_444Test.java b/src/test/java/com/fishercoder/firstthousand/_444Test.java
index 0599891a77..c1909dc6c6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_444Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_444Test.java
@@ -1,22 +1,22 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._444;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _444Test {
-    private static _444.Solution1 solution1;
+    private _444.Solution1 solution1;
     private static int[] org;
     private static List<List<Integer>> seqs;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _444.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_445Test.java b/src/test/java/com/fishercoder/firstthousand/_445Test.java
index 2073ba5c5d..f002919173 100644
--- a/src/test/java/com/fishercoder/firstthousand/_445Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_445Test.java
@@ -3,20 +3,20 @@
 import com.fishercoder.common.classes.ListNode;
 import com.fishercoder.common.utils.LinkedListUtils;
 import com.fishercoder.solutions.firstthousand._445;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 5/13/17.
  */
 public class _445Test {
-    private static _445.Solution1 solution1;
-    private static _445.Solution2 solution2;
+    private _445.Solution1 solution1;
+    private _445.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _445.Solution1();
         solution2 = new _445.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_447Test.java b/src/test/java/com/fishercoder/firstthousand/_447Test.java
index d4318372b7..62cab29f17 100644
--- a/src/test/java/com/fishercoder/firstthousand/_447Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_447Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._447;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _447Test {
-    private static _447.Solution1 solution1;
+    private _447.Solution1 solution1;
     private static int[][] points;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _447.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_449Test.java b/src/test/java/com/fishercoder/firstthousand/_449Test.java
index 0195eb8768..a28e6b9b27 100644
--- a/src/test/java/com/fishercoder/firstthousand/_449Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_449Test.java
@@ -2,28 +2,28 @@
 
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.solutions.firstthousand._449;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _449Test {
-    private static _449.Solution1 solution1;
-    private static _449.Solution2 solution2;
-    private static _449.Solution3 solution3;
-    private static _449.Solution4 solution4;
+    private _449.Solution1 solution1;
+    private _449.Solution2 solution2;
+    private _449.Solution3 solution3;
+    private _449.Solution4 solution4;
     private static TreeNode expectedRoot;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _449.Solution1();
         solution2 = new _449.Solution2();
         solution3 = new _449.Solution3();
         solution4 = new _449.Solution4();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_44Test.java b/src/test/java/com/fishercoder/firstthousand/_44Test.java
index 7997dfd733..8193e68463 100644
--- a/src/test/java/com/fishercoder/firstthousand/_44Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_44Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _44Test {
-    private static _44.Solution1 solution1;
+    private _44.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_450Test.java b/src/test/java/com/fishercoder/firstthousand/_450Test.java
index f252752ffb..acc9cf0aef 100644
--- a/src/test/java/com/fishercoder/firstthousand/_450Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_450Test.java
@@ -3,22 +3,22 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._450;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _450Test {
-    private static _450.Solution1 solution1;
-    private static _450.Solution2 solution2;
-    private static _450.Solution3 solution3;
+    private _450.Solution1 solution1;
+    private _450.Solution2 solution2;
+    private _450.Solution3 solution3;
     private static TreeNode expected;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _450.Solution1();
         solution2 = new _450.Solution2();
         solution3 = new _450.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_451Test.java b/src/test/java/com/fishercoder/firstthousand/_451Test.java
index 85080d73a0..8e8225d0cb 100644
--- a/src/test/java/com/fishercoder/firstthousand/_451Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_451Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._451;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _451Test {
-    private static _451.Solution1 solution1;
-    private static _451.Solution2 solution2;
+    private _451.Solution1 solution1;
+    private _451.Solution2 solution2;
     private static String expected;
     private static String input;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _451.Solution1();
         solution2 = new _451.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_452Test.java b/src/test/java/com/fishercoder/firstthousand/_452Test.java
index b53d6662a2..cdc40d0a9c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_452Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_452Test.java
@@ -2,18 +2,18 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._452;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _452Test {
-    private static _452.Solution1 solution1;
-    private static _452.Solution2 solution2;
-    private static _452.Solution3 solution3;
+    private _452.Solution1 solution1;
+    private _452.Solution2 solution2;
+    private _452.Solution3 solution3;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _452.Solution1();
         solution2 = new _452.Solution2();
         solution3 = new _452.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_453Test.java b/src/test/java/com/fishercoder/firstthousand/_453Test.java
index 8a1645ed81..4a4023af2a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_453Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_453Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._453;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 public class _453Test {
-    private static _453.Solution1 solution1;
+    private _453.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _453.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_454Test.java b/src/test/java/com/fishercoder/firstthousand/_454Test.java
index cdad65e5f9..efd86f6dc9 100644
--- a/src/test/java/com/fishercoder/firstthousand/_454Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_454Test.java
@@ -1,13 +1,13 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._454;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _454Test {
-    private static _454.Solution1 solution1;
+    private _454.Solution1 solution1;
     private static int expected;
     private static int actual;
     private static int[] A;
@@ -15,8 +15,8 @@ public class _454Test {
     private static int[] C;
     private static int[] D;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _454.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_455Test.java b/src/test/java/com/fishercoder/firstthousand/_455Test.java
index c823a7052f..f72ee57cdf 100644
--- a/src/test/java/com/fishercoder/firstthousand/_455Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_455Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._455;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _455Test {
-    private static _455.Solution1 solution1;
+    private _455.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _455.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_456Test.java b/src/test/java/com/fishercoder/firstthousand/_456Test.java
index dbca51ce94..f0cead488e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_456Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_456Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._456;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _456Test {
-    private static _456.Solution1 solution1;
+    private _456.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _456.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_457Test.java b/src/test/java/com/fishercoder/firstthousand/_457Test.java
index d56460c853..6837f1266f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_457Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_457Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._457;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _457Test {
-    private static _457.Solution1 solution1;
+    private _457.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _457.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_458Test.java b/src/test/java/com/fishercoder/firstthousand/_458Test.java
index 61f28ab54f..3d09e4bf88 100644
--- a/src/test/java/com/fishercoder/firstthousand/_458Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_458Test.java
@@ -1,26 +1,26 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._458;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _458Test {
-    private static _458.Solution1 solution1;
+    private _458.Solution1 solution1;
     private static int expected;
     private static int actual;
     private static int buckets;
     private static int minutesToDie;
     private static int minutesToTest;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _458.Solution1();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         expected = 0;
         actual = 0;
diff --git a/src/test/java/com/fishercoder/firstthousand/_459Test.java b/src/test/java/com/fishercoder/firstthousand/_459Test.java
index 67e60fd130..ea42d66d1c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_459Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_459Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._459;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _459Test {
-    private static _459.Solution1 solution1;
-    private static _459.Solution2 solution2;
-    private static _459.Solution3 solution3;
+    private _459.Solution1 solution1;
+    private _459.Solution2 solution2;
+    private _459.Solution3 solution3;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _459.Solution1();
         solution2 = new _459.Solution2();
         solution3 = new _459.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_45Test.java b/src/test/java/com/fishercoder/firstthousand/_45Test.java
index 5d1809dc57..0640016e68 100644
--- a/src/test/java/com/fishercoder/firstthousand/_45Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_45Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _45Test {
-    private static _45.Solution1 solution1;
+    private _45.Solution1 solution1;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_460Test.java b/src/test/java/com/fishercoder/firstthousand/_460Test.java
index b3df61fbb2..6c241f0e04 100644
--- a/src/test/java/com/fishercoder/firstthousand/_460Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_460Test.java
@@ -1,13 +1,13 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._460;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _460Test {
 
-    private static _460.Solution1.LFUCache lfuCache;
+    private _460.Solution1.LFUCache lfuCache;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_461Test.java b/src/test/java/com/fishercoder/firstthousand/_461Test.java
index 7fa18338f2..33c201fd60 100644
--- a/src/test/java/com/fishercoder/firstthousand/_461Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_461Test.java
@@ -1,21 +1,21 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._461;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _461Test {
-    private static _461.Solution1 solution1;
-    private static _461.Solution2 solution2;
-    private static _461.Solution3 solution3;
+    private _461.Solution1 solution1;
+    private _461.Solution2 solution2;
+    private _461.Solution3 solution3;
     private static int x;
     private static int y;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _461.Solution1();
         solution2 = new _461.Solution2();
         solution3 = new _461.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_462Test.java b/src/test/java/com/fishercoder/firstthousand/_462Test.java
index 8c9f2be201..0c229142db 100644
--- a/src/test/java/com/fishercoder/firstthousand/_462Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_462Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._462;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _462Test {
-    private static _462.Solution1 solution1;
+    private _462.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _462.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_467Test.java b/src/test/java/com/fishercoder/firstthousand/_467Test.java
index 08e75a74fd..87c27a321b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_467Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_467Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._467;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _467Test {
-    private static _467.Solution1 solution1;
+    private _467.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _467.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_468Test.java b/src/test/java/com/fishercoder/firstthousand/_468Test.java
index a88ccbe032..e81438864c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_468Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_468Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._468;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _468Test {
-    private static _468.Solution1 solution1;
+    private _468.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _468.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_46Test.java b/src/test/java/com/fishercoder/firstthousand/_46Test.java
index 88bb825636..150f02d4e6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_46Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_46Test.java
@@ -6,9 +6,9 @@
 import org.junit.jupiter.api.Test;
 
 public class _46Test {
-    private static _46.Solution1 solution1;
-    private static _46.Solution2 solution2;
-    private static _46.Solution3 solution3;
+    private _46.Solution1 solution1;
+    private _46.Solution2 solution2;
+    private _46.Solution3 solution3;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_473Test.java b/src/test/java/com/fishercoder/firstthousand/_473Test.java
index dbe482f3f1..e042eef07f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_473Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_473Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._473;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _473Test {
-    private static _473.Solution1 solution1;
+    private _473.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _473.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_474Test.java b/src/test/java/com/fishercoder/firstthousand/_474Test.java
index 7774c2dc32..a291e8237f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_474Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_474Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._474;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _474Test {
-    private static _474.Solution1 solution1;
+    private _474.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _474.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_475Test.java b/src/test/java/com/fishercoder/firstthousand/_475Test.java
index 07f91a93b6..d208935dd2 100644
--- a/src/test/java/com/fishercoder/firstthousand/_475Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_475Test.java
@@ -1,23 +1,23 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._475;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 4/23/17.
  */
 public class _475Test {
-    private static _475.Solution1 test;
+    private _475.Solution1 test;
     private static int expected;
     private static int actual;
     private static int[] houses;
     private static int[] heaters;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         test = new _475.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_476Test.java b/src/test/java/com/fishercoder/firstthousand/_476Test.java
index c1cbf823f7..7d65681d87 100644
--- a/src/test/java/com/fishercoder/firstthousand/_476Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_476Test.java
@@ -1,29 +1,29 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._476;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 1/14/17.
  */
 public class _476Test {
-    private static _476.Solution1 solution1;
-    private static _476.Solution2 solution2;
+    private _476.Solution1 solution1;
+    private _476.Solution2 solution2;
     private static int expected;
     private static int actual;
     private static int input;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _476.Solution1();
         solution2 = new _476.Solution2();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         expected = 0;
         actual = 0;
diff --git a/src/test/java/com/fishercoder/firstthousand/_478Test.java b/src/test/java/com/fishercoder/firstthousand/_478Test.java
index 2d7e7e7c79..5d3c84ee65 100644
--- a/src/test/java/com/fishercoder/firstthousand/_478Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_478Test.java
@@ -2,10 +2,10 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._478;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class _478Test {
-    private static _478.Solution1 solution1;
+    private _478.Solution1 solution1;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_479Test.java b/src/test/java/com/fishercoder/firstthousand/_479Test.java
index 71b8c5884b..c67028a493 100644
--- a/src/test/java/com/fishercoder/firstthousand/_479Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_479Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._479;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _479Test {
-    private static _479.Solution1 solution1;
+    private _479.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _479.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_47Test.java b/src/test/java/com/fishercoder/firstthousand/_47Test.java
index 1ba4a66061..4fc97fe00b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_47Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_47Test.java
@@ -8,8 +8,8 @@
 import java.util.List;
 
 public class _47Test {
-    private static _47.Solution1 solution1;
-    private static _47.Solution2 solution2;
+    private _47.Solution1 solution1;
+    private _47.Solution2 solution2;
     private static List<List<Integer>> actual;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_480Test.java b/src/test/java/com/fishercoder/firstthousand/_480Test.java
index 24697ff1ef..005bb52bc0 100644
--- a/src/test/java/com/fishercoder/firstthousand/_480Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_480Test.java
@@ -1,22 +1,22 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._480;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 /**
  * Created by fishercoder on 5/27/17.
  */
 public class _480Test {
-    private static _480.Solution1 solution1;
+    private _480.Solution1 solution1;
     private static int[] nums;
     private static double[] expected;
     private static int k;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _480.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_482Test.java b/src/test/java/com/fishercoder/firstthousand/_482Test.java
index d1e00766f9..2a58e16eaa 100644
--- a/src/test/java/com/fishercoder/firstthousand/_482Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_482Test.java
@@ -1,25 +1,25 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._482;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _482Test {
-    private static _482.Solution1 solution1;
+    private _482.Solution1 solution1;
     private static String expected;
     private static String actual;
     private static String S;
     private static int k;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _482.Solution1();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         expected = "";
         actual = "";
diff --git a/src/test/java/com/fishercoder/firstthousand/_485Test.java b/src/test/java/com/fishercoder/firstthousand/_485Test.java
index c5376aacd7..47d1becf42 100644
--- a/src/test/java/com/fishercoder/firstthousand/_485Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_485Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._485;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _485Test {
-    private static _485.Solution1 solution1;
-    private static _485.Solution2 solution2;
+    private _485.Solution1 solution1;
+    private _485.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _485.Solution1();
         solution2 = new _485.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_487Test.java b/src/test/java/com/fishercoder/firstthousand/_487Test.java
index 0915137788..8876f4009a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_487Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_487Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _487Test {
-    private static _487.Solution1 soution1;
-    private static _487.Solution2 soution2;
+    private _487.Solution1 soution1;
+    private _487.Solution2 soution2;
     private static int[] nums;
     private static int expected;
     private static int actual;
diff --git a/src/test/java/com/fishercoder/firstthousand/_48Test.java b/src/test/java/com/fishercoder/firstthousand/_48Test.java
index 2625ea99ee..09a4c797c6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_48Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_48Test.java
@@ -6,9 +6,9 @@
 import org.junit.jupiter.api.Test;
 
 public class _48Test {
-    private static _48.Solution1 solution1;
-    private static _48.Solution2 solution2;
-    private static _48.Solution3 solution3;
+    private _48.Solution1 solution1;
+    private _48.Solution2 solution2;
+    private _48.Solution3 solution3;
     private static int[][] matrix;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_490Test.java b/src/test/java/com/fishercoder/firstthousand/_490Test.java
index a048affbd8..9f8cfcf65e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_490Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_490Test.java
@@ -1,26 +1,26 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._490;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _490Test {
-    private static _490 test;
+    private _490 test;
     private static boolean expected;
     private static boolean actual;
     private static int[][] maze;
     private static int[] start;
     private static int[] destination;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         test = new _490();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_491Test.java b/src/test/java/com/fishercoder/firstthousand/_491Test.java
index e845cbea76..f1dd57b92d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_491Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_491Test.java
@@ -2,17 +2,17 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._491;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
 public class _491Test {
-  private static _491.Solution1 solution1;
+  private _491.Solution1 solution1;
   private static int[] nums;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _491.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_492Test.java b/src/test/java/com/fishercoder/firstthousand/_492Test.java
index ce30958056..67bd489839 100644
--- a/src/test/java/com/fishercoder/firstthousand/_492Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_492Test.java
@@ -1,27 +1,27 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._492;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 /**
  * Created by fishercoder on 1/25/17.
  */
 public class _492Test {
-    private static _492.Solution1 solution1;
+    private _492.Solution1 solution1;
     private static int[] expected;
     private static int[] actual;
     private static int area;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _492.Solution1();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         expected = new int[]{0, 0};
         actual = new int[]{0, 0};
diff --git a/src/test/java/com/fishercoder/firstthousand/_493Test.java b/src/test/java/com/fishercoder/firstthousand/_493Test.java
index e744d31ddb..0d962e0f30 100644
--- a/src/test/java/com/fishercoder/firstthousand/_493Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_493Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._493;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _493Test {
-    private static _493.Solution1 solution1;
+    private _493.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _493.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_494Test.java b/src/test/java/com/fishercoder/firstthousand/_494Test.java
index cd4190cd15..396aa2dc4e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_494Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_494Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._494;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _494Test {
-    private static _494.Solution1 solution1;
+    private _494.Solution1 solution1;
     private static int expected;
     private static int actual;
     private static int S;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _494.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_495Test.java b/src/test/java/com/fishercoder/firstthousand/_495Test.java
index b2e4be7a1b..23249fc8fd 100644
--- a/src/test/java/com/fishercoder/firstthousand/_495Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_495Test.java
@@ -1,10 +1,10 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._495;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 5/8/17.
@@ -16,7 +16,7 @@ public class _495Test {
     private static int[] timeSeries;
     private static int duration = 0;
 
-    @Before
+    @BeforeEach
     public void setup() {
         timeSeries = new int[]{};
         duration = 0;
diff --git a/src/test/java/com/fishercoder/firstthousand/_496Test.java b/src/test/java/com/fishercoder/firstthousand/_496Test.java
index 5acef165c7..1a3c22d704 100644
--- a/src/test/java/com/fishercoder/firstthousand/_496Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_496Test.java
@@ -1,27 +1,27 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._496;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _496Test {
-    private static _496.Solution1 solution1;
-    private static _496.Solution2 solution2;
+    private _496.Solution1 solution1;
+    private _496.Solution2 solution2;
     private static int[] findNums;
     private static int[] nums;
     private static int[] expected;
     private static int[] actual;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _496.Solution1();
         solution2 = new _496.Solution2();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         expected = new int[]{};
         actual = new int[]{};
diff --git a/src/test/java/com/fishercoder/firstthousand/_498Test.java b/src/test/java/com/fishercoder/firstthousand/_498Test.java
index 7f6a0b8856..99cfb2e287 100644
--- a/src/test/java/com/fishercoder/firstthousand/_498Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_498Test.java
@@ -10,8 +10,8 @@
  * Created by fishercoder on 5/26/17.
  */
 public class _498Test {
-    private static _498.Solutoin1 solutoin1;
-    private static _498.Solutoin2 solutoin2;
+    private _498.Solutoin1 solutoin1;
+    private _498.Solutoin2 solutoin2;
     private static int[][] matrix;
     private static int[] expected;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_49Test.java b/src/test/java/com/fishercoder/firstthousand/_49Test.java
index 3521d5e9ea..7aa932bf08 100644
--- a/src/test/java/com/fishercoder/firstthousand/_49Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_49Test.java
@@ -12,7 +12,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class _49Test {
-    private static _49.Solution1 solution1;
+    private _49.Solution1 solution1;
     private static String[] words;
     private static List<List<String>> expected;
     private static List<List<String>> actual;
diff --git a/src/test/java/com/fishercoder/firstthousand/_4Test.java b/src/test/java/com/fishercoder/firstthousand/_4Test.java
index d91f453e20..2ec238a697 100644
--- a/src/test/java/com/fishercoder/firstthousand/_4Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_4Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _4Test {
-    private static _4.Solution1 solution1;
-    private static _4.Solution2 solution2;
+    private _4.Solution1 solution1;
+    private _4.Solution2 solution2;
     private static int[] A;
     private static int[] B;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_500Test.java b/src/test/java/com/fishercoder/firstthousand/_500Test.java
index 516d376da7..f50700df20 100644
--- a/src/test/java/com/fishercoder/firstthousand/_500Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_500Test.java
@@ -1,22 +1,22 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._500;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 /**
  * Created by fishercoder on 1/15/17.
  */
 public class _500Test {
-    private static _500 test;
+    private _500 test;
     private static String[] expected;
     private static String[] actual;
     private String[] words;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         test = new _500();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_501Test.java b/src/test/java/com/fishercoder/firstthousand/_501Test.java
index e1450ce2ba..0b3ec35562 100644
--- a/src/test/java/com/fishercoder/firstthousand/_501Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_501Test.java
@@ -3,29 +3,29 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._501;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 /**
  * Created by fishercoder on 1/28/17.
  */
 public class _501Test {
-    private static _501.Solution1 solution1;
-    private static _501.Solution2 solution2;
+    private _501.Solution1 solution1;
+    private _501.Solution2 solution2;
     private static int[] expected;
     private static int[] actual;
     private static TreeNode treeNode;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _501.Solution1();
         solution2 = new _501.Solution2();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         expected = new int[]{};
         actual = new int[]{};
diff --git a/src/test/java/com/fishercoder/firstthousand/_502Test.java b/src/test/java/com/fishercoder/firstthousand/_502Test.java
index c2db9e2262..49cbbf7300 100644
--- a/src/test/java/com/fishercoder/firstthousand/_502Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_502Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._502;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _502Test {
-    private static _502.Solution1 solution1;
+    private _502.Solution1 solution1;
     private static int[] Profits;
     private static int[] Capital;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _502.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_503Test.java b/src/test/java/com/fishercoder/firstthousand/_503Test.java
index 0c04e27fdd..7e9ae45827 100644
--- a/src/test/java/com/fishercoder/firstthousand/_503Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_503Test.java
@@ -1,26 +1,26 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._503;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _503Test {
-    private static _503.Solution1 solution1;
-    private static _503.Solution2 solution2;
+    private _503.Solution1 solution1;
+    private _503.Solution2 solution2;
     private static int[] nums;
     private static int[] expected;
     private static int[] actual;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _503.Solution1();
         solution2 = new _503.Solution2();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         expected = new int[]{};
         nums = new int[]{};
diff --git a/src/test/java/com/fishercoder/firstthousand/_504Test.java b/src/test/java/com/fishercoder/firstthousand/_504Test.java
index 6f31a8b59c..822fc23fc3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_504Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_504Test.java
@@ -1,27 +1,27 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._504;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 1/15/17.
  */
 public class _504Test {
-    private static _504.Solution1 solution1;
+    private _504.Solution1 solution1;
     private static String expected;
     private static String actual;
     private static int num;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _504.Solution1();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         expected = "";
         actual = "";
diff --git a/src/test/java/com/fishercoder/firstthousand/_505Test.java b/src/test/java/com/fishercoder/firstthousand/_505Test.java
index 85560888cf..198609a158 100644
--- a/src/test/java/com/fishercoder/firstthousand/_505Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_505Test.java
@@ -1,26 +1,26 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._505;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _505Test {
-    private static _505.Solution1 solution1;
+    private _505.Solution1 solution1;
     private static int expected;
     private static int actual;
     private static int[][] maze;
     private static int[] start;
     private static int[] destination;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _505.Solution1();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_506Test.java b/src/test/java/com/fishercoder/firstthousand/_506Test.java
index 16e6213336..5014656876 100644
--- a/src/test/java/com/fishercoder/firstthousand/_506Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_506Test.java
@@ -1,27 +1,27 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._506;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 /**
  * Created by fishercoder on 1/15/17.
  */
 public class _506Test {
-    private static _506.Solution1 solution1;
+    private _506.Solution1 solution1;
     private static String[] expected;
     private static String[] actual;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _506.Solution1();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         expected = new String[]{};
         actual = new String[]{};
diff --git a/src/test/java/com/fishercoder/firstthousand/_507Test.java b/src/test/java/com/fishercoder/firstthousand/_507Test.java
index 4ced43364c..1e3b578624 100644
--- a/src/test/java/com/fishercoder/firstthousand/_507Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_507Test.java
@@ -1,27 +1,27 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._507;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 1/25/17.
  */
 public class _507Test {
-    private static _507.Solution1 solution1;
+    private _507.Solution1 solution1;
     private static boolean expected;
     private static boolean actual;
     private static int num;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _507.Solution1();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_508Test.java b/src/test/java/com/fishercoder/firstthousand/_508Test.java
index 2b01df5e2b..7653dd9f76 100644
--- a/src/test/java/com/fishercoder/firstthousand/_508Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_508Test.java
@@ -11,9 +11,9 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _508Test {
-    private static _508.Solution1 solution1;
-    private static _508.Solution2 solution2;
-    private static _508.Solution3 solution3;
+    private _508.Solution1 solution1;
+    private _508.Solution2 solution2;
+    private _508.Solution3 solution3;
     private static int[] expected;
     private static int[] actual;
     private static TreeNode root;
diff --git a/src/test/java/com/fishercoder/firstthousand/_509Test.java b/src/test/java/com/fishercoder/firstthousand/_509Test.java
index abd01fcc38..f58603f55b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_509Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_509Test.java
@@ -7,9 +7,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _509Test {
-    private static _509.Solution1 solution1;
-    private static _509.Solution2 solution2;
-    private static _509.Solution3 solution3;
+    private _509.Solution1 solution1;
+    private _509.Solution2 solution2;
+    private _509.Solution3 solution3;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_50Test.java b/src/test/java/com/fishercoder/firstthousand/_50Test.java
index f9a304f031..9cc9332ab8 100644
--- a/src/test/java/com/fishercoder/firstthousand/_50Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_50Test.java
@@ -7,9 +7,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _50Test {
-    private static _50.Solution1 solution1;
-    private static _50.Solution2 solution2;
-    private static _50.Solution3 solution3;
+    private _50.Solution1 solution1;
+    private _50.Solution2 solution2;
+    private _50.Solution3 solution3;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_513Test.java b/src/test/java/com/fishercoder/firstthousand/_513Test.java
index 2b52993257..d86a035820 100644
--- a/src/test/java/com/fishercoder/firstthousand/_513Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_513Test.java
@@ -2,27 +2,27 @@
 
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.solutions.firstthousand._513;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 1/15/17.
  */
 public class _513Test {
-    private static _513.Solution1 solution1;
+    private _513.Solution1 solution1;
     private static int expected;
     private static int actual;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _513.Solution1();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         expected = 0;
         actual = 0;
diff --git a/src/test/java/com/fishercoder/firstthousand/_515Test.java b/src/test/java/com/fishercoder/firstthousand/_515Test.java
index 39db103b44..baa5420fb1 100644
--- a/src/test/java/com/fishercoder/firstthousand/_515Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_515Test.java
@@ -2,24 +2,24 @@
 
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.solutions.firstthousand._515;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _515Test {
-    private static _515.Solution1 solution1;
-    private static _515.Solution2 solution2;
+    private _515.Solution1 solution1;
+    private _515.Solution2 solution2;
     private static List<Integer> expected;
     private static List<Integer> actual;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _515.Solution1();
         solution2 = new _515.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_516Test.java b/src/test/java/com/fishercoder/firstthousand/_516Test.java
index 15e153ff8c..153009d430 100644
--- a/src/test/java/com/fishercoder/firstthousand/_516Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_516Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._516;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _516Test {
-    private static _516.Solution1 solution1;
+    private _516.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _516.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_518Test.java b/src/test/java/com/fishercoder/firstthousand/_518Test.java
index ade5d398f2..dd6a2e225f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_518Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_518Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._518;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _518Test {
-    private static _518.Solution1 solution1;
+    private _518.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _518.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_519Test.java b/src/test/java/com/fishercoder/firstthousand/_519Test.java
index c75bde8c69..5692a4bd7d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_519Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_519Test.java
@@ -6,7 +6,7 @@
 
 public class _519Test {
 
-    private static _519.Solution solution1;
+    private _519.Solution solution1;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_51Test.java b/src/test/java/com/fishercoder/firstthousand/_51Test.java
index 249f02f2a6..1c08794d17 100644
--- a/src/test/java/com/fishercoder/firstthousand/_51Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_51Test.java
@@ -11,7 +11,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _51Test {
-    private static _51.Solution1 solution1;
+    private _51.Solution1 solution1;
     private static List<List<String>> expected;
     private static List<List<String>> actual;
     private static int n;
diff --git a/src/test/java/com/fishercoder/firstthousand/_522Test.java b/src/test/java/com/fishercoder/firstthousand/_522Test.java
index c1da36a1f6..8550921c5d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_522Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_522Test.java
@@ -1,23 +1,23 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._522;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 12/31/16.
  */
 public class _522Test {
 
-    private static _522.Solution1 solution1;
+    private _522.Solution1 solution1;
     private static int expected;
     private static int actual;
     private static String[] strs;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _522.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_523Test.java b/src/test/java/com/fishercoder/firstthousand/_523Test.java
index d156e9bca9..d225587255 100644
--- a/src/test/java/com/fishercoder/firstthousand/_523Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_523Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._523;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _523Test {
-    private static _523.Solution1 solution1;
-    private static _523.Solution2 solution2;
+    private _523.Solution1 solution1;
+    private _523.Solution2 solution2;
     private static boolean expected;
     private static int[] nums;
     private static int k;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _523.Solution1();
         solution2 = new _523.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_524Test.java b/src/test/java/com/fishercoder/firstthousand/_524Test.java
index ffcd7e9c1c..cfcb0cd5e0 100644
--- a/src/test/java/com/fishercoder/firstthousand/_524Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_524Test.java
@@ -1,26 +1,26 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._524;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 4/30/17.
  */
 public class _524Test {
-    private static _524.Solution1 solution1;
+    private _524.Solution1 solution1;
     private static String expected;
     private static String actual;
     private static String s;
     private static ArrayList d;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _524.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_525Test.java b/src/test/java/com/fishercoder/firstthousand/_525Test.java
index c732256753..a878562925 100644
--- a/src/test/java/com/fishercoder/firstthousand/_525Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_525Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._525;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _525Test {
-    private static _525.Solution1 solution1;
+    private _525.Solution1 solution1;
     private static int expected;
     private static int actual;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _525.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_526Test.java b/src/test/java/com/fishercoder/firstthousand/_526Test.java
index 02483855d0..8a070ff41d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_526Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_526Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._526;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _526Test {
-    private static _526.Solution1 solution1;
+    private _526.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _526.Solution1();
     }
 
@@ -21,7 +21,7 @@ public void test1() {
 
     @Test
     public void test2() {
-        assertEquals(5, solution1.countArrangement(3));
+        assertEquals(3, solution1.countArrangement(3));
     }
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/fishercoder/firstthousand/_527Test.java b/src/test/java/com/fishercoder/firstthousand/_527Test.java
index d5b295d8a4..ba61f7b3fb 100644
--- a/src/test/java/com/fishercoder/firstthousand/_527Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_527Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._527;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _527Test {
     
-    private static _527.Solution1 solution1;
+    private _527.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _527.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_528Test.java b/src/test/java/com/fishercoder/firstthousand/_528Test.java
index f4760695d3..b36bd61172 100644
--- a/src/test/java/com/fishercoder/firstthousand/_528Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_528Test.java
@@ -6,7 +6,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _528Test {
-    private static _528.Solution1 solution1;
+    private _528.Solution1 solution1;
     private static int expected;
 
     @Test
diff --git a/src/test/java/com/fishercoder/firstthousand/_529Test.java b/src/test/java/com/fishercoder/firstthousand/_529Test.java
index c18c83e59b..87e8602ee4 100644
--- a/src/test/java/com/fishercoder/firstthousand/_529Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_529Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _529Test {
-    private static _529.Solution1 solution1;
+    private _529.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_52Test.java b/src/test/java/com/fishercoder/firstthousand/_52Test.java
index 8fff2f18ef..c40dd82c79 100644
--- a/src/test/java/com/fishercoder/firstthousand/_52Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_52Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _52Test {
-    private static _52.Solution1 solution1;
+    private _52.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_530Test.java b/src/test/java/com/fishercoder/firstthousand/_530Test.java
index 312205850a..1dc2a71ca6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_530Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_530Test.java
@@ -2,24 +2,24 @@
 
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.solutions.firstthousand._530;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _530Test {
-    private static _530.Solution1 solution1;
+    private _530.Solution1 solution1;
     private static int expected;
     private static int actual;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _530.Solution1();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         expected = 0;
         actual = 0;
diff --git a/src/test/java/com/fishercoder/firstthousand/_532Test.java b/src/test/java/com/fishercoder/firstthousand/_532Test.java
index 7bb91285bd..11279d32a6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_532Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_532Test.java
@@ -1,32 +1,32 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._532;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _532Test {
-    private static _532.Solution1 test;
+    private _532.Solution1 test;
     private static int expected;
     private static int actual;
     private static int k;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() throws IOException {
+    @BeforeEach
+    public void setup() throws IOException {
         test = new _532.Solution1();
         Properties properties = new Properties();
         InputStream inputStream = _532.class.getClassLoader().getResourceAsStream("fishercoder.properties");
         properties.load(inputStream);
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         expected = 0;
         actual = 0;
diff --git a/src/test/java/com/fishercoder/firstthousand/_533Test.java b/src/test/java/com/fishercoder/firstthousand/_533Test.java
index e05a0a6b63..d7dd6b1223 100644
--- a/src/test/java/com/fishercoder/firstthousand/_533Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_533Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._533;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _533Test {
-    private static _533.Solution1 solution1;
+    private _533.Solution1 solution1;
     private static char[][] picture;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _533.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_536Test.java b/src/test/java/com/fishercoder/firstthousand/_536Test.java
index 609abc0ee6..fe58bbb2d4 100644
--- a/src/test/java/com/fishercoder/firstthousand/_536Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_536Test.java
@@ -3,21 +3,21 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._536;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _536Test {
-    private static _536.Solution1 solution1;
-    private static _536.Solution2 solution2;
+    private _536.Solution1 solution1;
+    private _536.Solution2 solution2;
     private static TreeNode expected;
     private static String s;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _536.Solution1();
         solution2 = new _536.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_537Test.java b/src/test/java/com/fishercoder/firstthousand/_537Test.java
index 5b180cd08f..5f140e989f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_537Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_537Test.java
@@ -1,29 +1,29 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._537;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 1/25/17.
  */
 public class _537Test {
-    private static _537 .Solution1 solution1;
-    private static _537 .Solution2 solution2;
+    private _537 .Solution1 solution1;
+    private _537 .Solution2 solution2;
     private static String expected;
     private static String a;
     private static String b;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _537.Solution1();
         solution2 = new _537.Solution2();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_538Test.java b/src/test/java/com/fishercoder/firstthousand/_538Test.java
index cf677a0ad8..494590dc16 100644
--- a/src/test/java/com/fishercoder/firstthousand/_538Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_538Test.java
@@ -2,18 +2,18 @@
 
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.solutions.firstthousand._538;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _538Test {
-    private static _538.Solution1 solution1;
-    private static _538.Solution2 solution2;
+    private _538.Solution1 solution1;
+    private _538.Solution2 solution2;
     private static TreeNode expectedRoot;
     private static TreeNode root;
 
-    @Before
+    @BeforeEach
     public void setup() {
         solution1 = new _538.Solution1();
         solution2 = new _538.Solution2();
diff --git a/src/test/java/com/fishercoder/firstthousand/_539Test.java b/src/test/java/com/fishercoder/firstthousand/_539Test.java
index 58b5691d67..1f7f68c3d3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_539Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_539Test.java
@@ -1,28 +1,28 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._539;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _539Test {
-    private static _539.Soluiton1 soluiton1;
+    private _539.Soluiton1 soluiton1;
     private static int expected;
     private static int actual;
     private static List<String> timePoints;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         soluiton1 = new _539.Soluiton1();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         expected = 0;
         actual = 0;
diff --git a/src/test/java/com/fishercoder/firstthousand/_53Test.java b/src/test/java/com/fishercoder/firstthousand/_53Test.java
index 3c528a5b71..c47b292b6a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_53Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_53Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _53Test {
-    private static _53.Solution1 solution1;
+    private _53.Solution1 solution1;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_540Test.java b/src/test/java/com/fishercoder/firstthousand/_540Test.java
index 0b0b8a9718..775cbc27bf 100644
--- a/src/test/java/com/fishercoder/firstthousand/_540Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_540Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._540;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _540Test {
-    private static _540.Solution1 solution1;
-    private static _540.Solution2 solution2;
-    private static _540.Solution3 solution3;
+    private _540.Solution1 solution1;
+    private _540.Solution2 solution2;
+    private _540.Solution3 solution3;
     private static int[] nums;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _540.Solution1();
         solution2 = new _540.Solution2();
         solution3 = new _540.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_541Test.java b/src/test/java/com/fishercoder/firstthousand/_541Test.java
index ed794b0ee8..93339b8fab 100644
--- a/src/test/java/com/fishercoder/firstthousand/_541Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_541Test.java
@@ -1,25 +1,25 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._541;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _541Test {
-    private static _541.Solution1 solution1;
+    private _541.Solution1 solution1;
     private static String expected;
     private static String actual;
     private static String s;
     private static int k;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _541.Solution1();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_542Test.java b/src/test/java/com/fishercoder/firstthousand/_542Test.java
index 8cd974d3c1..4e370b0554 100644
--- a/src/test/java/com/fishercoder/firstthousand/_542Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_542Test.java
@@ -2,17 +2,17 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._542;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _542Test {
-    private static _542.Solution1 solution1;
-    private static _542.Solution2 solution2;
+    private _542.Solution1 solution1;
+    private _542.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _542.Solution1();
         solution2 = new _542.Solution2();
     }
@@ -21,16 +21,16 @@ public static void setup() {
     public void test1() {
         int[][] matrix = CommonUtils.convertLeetCodeIrregularLengths2DArrayInputIntoJavaArray("[1,1,0,1,1,1,1,1,1,1],[1,1,0,1,1,1,1,1,1,1],[1,1,1,1,0,0,0,1,1,0],[1,1,1,1,1,1,0,0,1,0],[1,0,0,1,1,1,0,1,0,1],[0,0,1,0,0,1,1,0,0,1],[0,1,0,1,1,1,1,1,1,1],[1,0,0,1,1,0,0,0,0,0],[0,0,1,1,1,1,0,1,1,1],[1,1,0,0,1,0,1,0,1,1]");
         int[][] expected = CommonUtils.convertLeetCodeIrregularLengths2DArrayInputIntoJavaArray("[2,1,0,1,2,2,2,3,3,2],[2,1,0,1,1,1,1,2,2,1],[3,2,1,1,0,0,0,1,1,0],[2,1,1,2,1,1,0,0,1,0],[1,0,0,1,1,1,0,1,0,1],[0,0,1,0,0,1,1,0,0,1],[0,1,0,1,1,1,1,1,1,1],[1,0,0,1,1,0,0,0,0,0],[0,0,1,1,2,1,0,1,1,1],[1,1,0,0,1,0,1,0,1,2]");
-        assertEquals(expected, solution1.updateMatrix(matrix));
-        assertEquals(expected, solution2.updateMatrix(matrix));
+        assertArrayEquals(expected, solution1.updateMatrix(matrix));
+        assertArrayEquals(expected, solution2.updateMatrix(matrix));
     }
 
     @Test
     public void test2() {
         int[][] matrix = CommonUtils.convertLeetCodeIrregularLengths2DArrayInputIntoJavaArray("[0,0,0],[0,1,0],[0,0,0]");
         int[][] expected = CommonUtils.convertLeetCodeIrregularLengths2DArrayInputIntoJavaArray("[0,0,0],[0,1,0],[0,0,0]");
-        assertEquals(expected, solution1.updateMatrix(matrix));
-        assertEquals(expected, solution2.updateMatrix(matrix));
+        assertArrayEquals(expected, solution1.updateMatrix(matrix));
+        assertArrayEquals(expected, solution2.updateMatrix(matrix));
     }
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/fishercoder/firstthousand/_543Test.java b/src/test/java/com/fishercoder/firstthousand/_543Test.java
index f9d376b0ff..6158d92842 100644
--- a/src/test/java/com/fishercoder/firstthousand/_543Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_543Test.java
@@ -11,7 +11,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _543Test {
-    private static _543.Solution1 solution1;
+    private _543.Solution1 solution1;
     private static TreeNode root;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_544Test.java b/src/test/java/com/fishercoder/firstthousand/_544Test.java
index c5ff2edb2e..3b249e8eb9 100644
--- a/src/test/java/com/fishercoder/firstthousand/_544Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_544Test.java
@@ -1,24 +1,24 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._544;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _544Test {
-    private static _544 test;
+    private _544 test;
     private static int n;
     private static String expected;
     private static String actual;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         test = new _544();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_545Test.java b/src/test/java/com/fishercoder/firstthousand/_545Test.java
index 4a4d9cfe9f..d6c254fb17 100644
--- a/src/test/java/com/fishercoder/firstthousand/_545Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_545Test.java
@@ -3,21 +3,21 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._545;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _545Test {
-    private static _545.Solution1 test;
+    private _545.Solution1 test;
     private static TreeNode root;
     private static List<Integer> expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         test = new _545.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_547Test.java b/src/test/java/com/fishercoder/firstthousand/_547Test.java
index 55d74b32d5..fadbc24577 100644
--- a/src/test/java/com/fishercoder/firstthousand/_547Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_547Test.java
@@ -10,7 +10,7 @@
  * Created by fishercoder on 1/9/17.
  */
 public class _547Test {
-    private static _547.Solution1 test;
+    private _547.Solution1 test;
     private static int expected;
     private static int actual;
     private static int[][] isConnected;
diff --git a/src/test/java/com/fishercoder/firstthousand/_548Test.java b/src/test/java/com/fishercoder/firstthousand/_548Test.java
index 5d5379e92c..2a9a372c22 100644
--- a/src/test/java/com/fishercoder/firstthousand/_548Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_548Test.java
@@ -1,24 +1,24 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._548;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _548Test {
-    private static _548.Solution1 test;
+    private _548.Solution1 test;
     private static boolean expected;
     private static boolean actual;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         test = new _548.Solution1();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         nums = new int[1000];
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_549Test.java b/src/test/java/com/fishercoder/firstthousand/_549Test.java
index b617f01915..015ab2eb7c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_549Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_549Test.java
@@ -3,25 +3,25 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._549;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _549Test {
-    private static _549.Solution1 solution1;
+    private _549.Solution1 solution1;
     private static int expected;
     private static int actual;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         root = null;
         actual = 0;
diff --git a/src/test/java/com/fishercoder/firstthousand/_54Test.java b/src/test/java/com/fishercoder/firstthousand/_54Test.java
index e0971d7811..2eff4459d9 100644
--- a/src/test/java/com/fishercoder/firstthousand/_54Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_54Test.java
@@ -9,7 +9,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _54Test {
-    private static _54.Solution1 solution1;
+    private _54.Solution1 solution1;
     private static int[][] matrix;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_551Test.java b/src/test/java/com/fishercoder/firstthousand/_551Test.java
index 61bbb7ea18..e47bcf7872 100644
--- a/src/test/java/com/fishercoder/firstthousand/_551Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_551Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._551;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _551Test {
-    private static _551.Solution1 test;
+    private _551.Solution1 test;
     private static boolean expected;
     private static boolean actual;
     private static String s;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         test = new _551.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_553Test.java b/src/test/java/com/fishercoder/firstthousand/_553Test.java
index be10641575..3d54331f62 100644
--- a/src/test/java/com/fishercoder/firstthousand/_553Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_553Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._553;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 5/25/17.
  */
 public class _553Test {
-    private static _553.Solution1 solution1;
+    private _553.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _553.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_554Test.java b/src/test/java/com/fishercoder/firstthousand/_554Test.java
index 548c5e0399..87a689b07f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_554Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_554Test.java
@@ -1,28 +1,28 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._554;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _554Test {
-    private static _554.Solution1 test;
+    private _554.Solution1 test;
     private static int expected;
     private static int actual;
     private static List<List<Integer>> wall;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         test = new _554.Solution1();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_555Test.java b/src/test/java/com/fishercoder/firstthousand/_555Test.java
index f0add49d98..6a02dba53c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_555Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_555Test.java
@@ -1,22 +1,22 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._555;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 4/29/17.
  */
 public class _555Test {
-    private static _555.Solution1 solution1;
+    private _555.Solution1 solution1;
     private static String expected;
     private static String actual;
     private static String[] strs;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _555.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_556Test.java b/src/test/java/com/fishercoder/firstthousand/_556Test.java
index 78532d261c..b67b642750 100644
--- a/src/test/java/com/fishercoder/firstthousand/_556Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_556Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._556;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class _556Test {
-    private static _556.Solution1 solution1;
+    private _556.Solution1 solution1;
     private static int n;
     private static int expected;
     private static int actual;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _556.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_559Test.java b/src/test/java/com/fishercoder/firstthousand/_559Test.java
index 21c57b47c5..11a7dfea84 100644
--- a/src/test/java/com/fishercoder/firstthousand/_559Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_559Test.java
@@ -3,17 +3,17 @@
 import com.fishercoder.common.classes.Node;
 import com.fishercoder.solutions.firstthousand._559;
 import java.util.Arrays;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _559Test {
-  private static _559.Solution1 solution1;
+  private _559.Solution1 solution1;
   private static Node root;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _559.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_55Test.java b/src/test/java/com/fishercoder/firstthousand/_55Test.java
index 64ae311eb2..0d8d7aa10c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_55Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_55Test.java
@@ -7,10 +7,10 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _55Test {
-    private static _55.Solution1 solution1;
-    private static _55.Solution2 solution2;
-    private static _55.Solution3 solution3;
-    private static _55.Solution4 solution4;
+    private _55.Solution1 solution1;
+    private _55.Solution2 solution2;
+    private _55.Solution3 solution3;
+    private _55.Solution4 solution4;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_560Test.java b/src/test/java/com/fishercoder/firstthousand/_560Test.java
index c269dc7140..03c2c3be2a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_560Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_560Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _560Test {
-    private static _560.Solution1 solution1;
-    private static _560.Solution2 solution2;
+    private _560.Solution1 solution1;
+    private _560.Solution2 solution2;
     private static int expected;
     private static int actual;
     private static int[] nums;
diff --git a/src/test/java/com/fishercoder/firstthousand/_561Test.java b/src/test/java/com/fishercoder/firstthousand/_561Test.java
index 09be262c8e..2433008785 100644
--- a/src/test/java/com/fishercoder/firstthousand/_561Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_561Test.java
@@ -1,22 +1,22 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._561;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 4/23/17.
  */
 public class _561Test {
-    private static _561.Solution1 solution1;
+    private _561.Solution1 solution1;
     private static int expected;
     private static int actual;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _561.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_562Test.java b/src/test/java/com/fishercoder/firstthousand/_562Test.java
index a5467a7fda..b26f27130b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_562Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_562Test.java
@@ -1,22 +1,22 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._562;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 4/23/17.
  */
 public class _562Test {
-    private static _562.Solution1 solution1;
+    private _562.Solution1 solution1;
     private static int expected;
     private static int actual;
     private static int[][] M;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _562.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_563Test.java b/src/test/java/com/fishercoder/firstthousand/_563Test.java
index 4298073f8f..d6f8027400 100644
--- a/src/test/java/com/fishercoder/firstthousand/_563Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_563Test.java
@@ -2,23 +2,23 @@
 
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.solutions.firstthousand._563;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 4/23/17.
  */
 public class _563Test {
-    private static _563.Solution1 solution1;
+    private _563.Solution1 solution1;
     private static int expected;
     private static int actual;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _563.Solution1();
         actual = 0;
     }
@@ -33,7 +33,7 @@ public void test1() {
         assertEquals(expected, actual);
     }
 
-    @Ignore
+    @Disabled
     @Test
     public void test2() {
         root = new TreeNode(1);
diff --git a/src/test/java/com/fishercoder/firstthousand/_566Test.java b/src/test/java/com/fishercoder/firstthousand/_566Test.java
index 559a11a65d..8dd3ce1440 100644
--- a/src/test/java/com/fishercoder/firstthousand/_566Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_566Test.java
@@ -1,25 +1,25 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._566;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 /**
  * Created by fishercoder on 4/29/17.
  */
 public class _566Test {
-    private static _566.Solution1 solution1;
-    private static _566.Solution2 solution2;
+    private _566.Solution1 solution1;
+    private _566.Solution2 solution2;
     private static int[][] expected;
     private static int[][] actual;
     private static int[][] nums;
     private static int r;
     private static int c;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _566.Solution1();
         solution2 = new _566.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_567Test.java b/src/test/java/com/fishercoder/firstthousand/_567Test.java
index d6c7334771..335bf1da8d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_567Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_567Test.java
@@ -1,21 +1,21 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._567;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _567Test {
-    private static _567.Solution1 solution1;
-    private static _567.Solution2 solution2;
+    private _567.Solution1 solution1;
+    private _567.Solution2 solution2;
     private static boolean expected;
     private static boolean actual;
     private static String s1;
     private static String s2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _567.Solution1();
         solution2 = new _567.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_56Test.java b/src/test/java/com/fishercoder/firstthousand/_56Test.java
index 4f156c31cd..5b0720771d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_56Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_56Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _56Test {
-    private static _56.Solution1 solution1;
+    private _56.Solution1 solution1;
     private static int[][] intervals;
     private static int[][] expected;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_572Test.java b/src/test/java/com/fishercoder/firstthousand/_572Test.java
index 4eacf87ab7..6aea4bb0ae 100644
--- a/src/test/java/com/fishercoder/firstthousand/_572Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_572Test.java
@@ -11,7 +11,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _572Test {
-    private static _572.Solution1 solution1;
+    private _572.Solution1 solution1;
     private static boolean expected;
     private static TreeNode root;
     private static TreeNode subRoot;
diff --git a/src/test/java/com/fishercoder/firstthousand/_575Test.java b/src/test/java/com/fishercoder/firstthousand/_575Test.java
index 503a21e67f..b56a8fbc17 100644
--- a/src/test/java/com/fishercoder/firstthousand/_575Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_575Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._575;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _575Test {
-    private static _575.Solution1 solution1;
+    private _575.Solution1 solution1;
     private static int expected;
     private static int actual;
     private static int[] candyType;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _575.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_57Test.java b/src/test/java/com/fishercoder/firstthousand/_57Test.java
index 922d22b2f5..054404f198 100644
--- a/src/test/java/com/fishercoder/firstthousand/_57Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_57Test.java
@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.Test;
 
 public class _57Test {
-    private static _57.Solution1 solution1;
+    private _57.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_581Test.java b/src/test/java/com/fishercoder/firstthousand/_581Test.java
index 1004ae11ed..1cc61b5b9c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_581Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_581Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._581;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _581Test {
-    private static _581.Solution1 solution1;
-    private static _581.Solution2 solution2;
-    private static _581.Solution3 solution3;
+    private _581.Solution1 solution1;
+    private _581.Solution2 solution2;
+    private _581.Solution3 solution3;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _581.Solution1();
         solution2 = new _581.Solution2();
         solution3 = new _581.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_582Test.java b/src/test/java/com/fishercoder/firstthousand/_582Test.java
index 2f44fa0ef1..f00e3577aa 100644
--- a/src/test/java/com/fishercoder/firstthousand/_582Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_582Test.java
@@ -1,26 +1,26 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._582;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 5/18/17.
  */
 public class _582Test {
-    private static _582.Solution1 solution1;
+    private _582.Solution1 solution1;
     private static List<Integer> pid;
     private static List<Integer> ppid;
     private static List<Integer> expected;
     private static Integer kill;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _582.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_583Test.java b/src/test/java/com/fishercoder/firstthousand/_583Test.java
index 44890fc33a..8da5278a23 100644
--- a/src/test/java/com/fishercoder/firstthousand/_583Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_583Test.java
@@ -1,21 +1,21 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._583;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 5/18/17.
  */
 public class _583Test {
-    private static _583.Solution1 solution1;
+    private _583.Solution1 solution1;
     private static String word1;
     private static String word2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _583.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_588Test.java b/src/test/java/com/fishercoder/firstthousand/_588Test.java
index 2e637bf54a..2fc2ad2049 100644
--- a/src/test/java/com/fishercoder/firstthousand/_588Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_588Test.java
@@ -1,23 +1,23 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._588;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 5/23/17.
  */
 public class _588Test {
 
-    private static _588.Solution1.FileSystem fileSystem;
+    private _588.Solution1.FileSystem fileSystem;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
     }
 
     @Test
diff --git a/src/test/java/com/fishercoder/firstthousand/_589Test.java b/src/test/java/com/fishercoder/firstthousand/_589Test.java
index 3808e83a2a..5ea16060d5 100644
--- a/src/test/java/com/fishercoder/firstthousand/_589Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_589Test.java
@@ -2,27 +2,27 @@
 
 import com.fishercoder.common.classes.Node;
 import com.fishercoder.solutions.firstthousand._589;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _589Test {
-  private static _589.Solution1 solution1;
+  private _589.Solution1 solution1;
   private static Node root;
   private static List<Integer> expectedPreOrder;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _589.Solution1();
   }
 
   @Test
-  @Ignore//todo: Node.createNaryTree method hasn't been implemented yet
+  @Disabled //todo: Node.createNaryTree method hasn't been implemented yet
   public void test1() {
     expectedPreOrder = Arrays.asList(1, 3, 5, 6, 2, 4);
     root = Node.createNaryTree(expectedPreOrder);
diff --git a/src/test/java/com/fishercoder/firstthousand/_58Test.java b/src/test/java/com/fishercoder/firstthousand/_58Test.java
index 5615ca02e7..8c0c079b21 100644
--- a/src/test/java/com/fishercoder/firstthousand/_58Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_58Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _58Test {
-    private static _58.Solution1 solution1;
+    private _58.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_591Test.java b/src/test/java/com/fishercoder/firstthousand/_591Test.java
index 56ac178640..537e41678a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_591Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_591Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._591;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _591Test {
-    private static _591.Solution1 test;
+    private _591.Solution1 test;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         test = new _591.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_592Test.java b/src/test/java/com/fishercoder/firstthousand/_592Test.java
index 0c3479f0c8..38da8bb721 100644
--- a/src/test/java/com/fishercoder/firstthousand/_592Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_592Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._592;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 5/23/17.
  */
 public class _592Test {
-    private static _592.Solution1 test;
+    private _592.Solution1 test;
     private static String expression;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         test = new _592.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_593Test.java b/src/test/java/com/fishercoder/firstthousand/_593Test.java
index 1628a6e1e5..7146b13ffd 100644
--- a/src/test/java/com/fishercoder/firstthousand/_593Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_593Test.java
@@ -1,23 +1,23 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._593;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 5/22/17.
  */
 public class _593Test {
-    private static _593.Solution1 solution1;
+    private _593.Solution1 solution1;
     private static int[] p1;
     private static int[] p2;
     private static int[] p3;
     private static int[] p4;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _593.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_594Test.java b/src/test/java/com/fishercoder/firstthousand/_594Test.java
index 0e9dd2e51d..5ae9bb8433 100644
--- a/src/test/java/com/fishercoder/firstthousand/_594Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_594Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._594;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 5/20/17.
  */
 public class _594Test {
-    private static _594.Solution1 solution1;
+    private _594.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _594.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_598Test.java b/src/test/java/com/fishercoder/firstthousand/_598Test.java
index 5a0981e0be..eb9c47f2fc 100644
--- a/src/test/java/com/fishercoder/firstthousand/_598Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_598Test.java
@@ -2,16 +2,16 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._598;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _598Test {
-    private static _598.Solution1 solution1;
+    private _598.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _598.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_59Test.java b/src/test/java/com/fishercoder/firstthousand/_59Test.java
index 8e53067bcb..c498ba65f5 100644
--- a/src/test/java/com/fishercoder/firstthousand/_59Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_59Test.java
@@ -6,8 +6,8 @@
 import org.junit.jupiter.api.Test;
 
 public class _59Test {
-    private static _59.Solution1 solution1;
-    private static _59.Solution2 solution2;
+    private _59.Solution1 solution1;
+    private _59.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_5Test.java b/src/test/java/com/fishercoder/firstthousand/_5Test.java
index eaefd32d27..06932c8365 100644
--- a/src/test/java/com/fishercoder/firstthousand/_5Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_5Test.java
@@ -7,9 +7,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _5Test {
-    private static _5.Solution1 solution1;
-    private static _5.Solution2 solution2;
-    private static _5.Solution3 solution3;
+    private _5.Solution1 solution1;
+    private _5.Solution2 solution2;
+    private _5.Solution3 solution3;
     private static String s;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_600Test.java b/src/test/java/com/fishercoder/firstthousand/_600Test.java
index d66bb7ba20..85f41aa660 100644
--- a/src/test/java/com/fishercoder/firstthousand/_600Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_600Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._600;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 5/28/17.
  */
 public class _600Test {
-    private static _600.Solution1 solution1;
+    private _600.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _600.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_604Test.java b/src/test/java/com/fishercoder/firstthousand/_604Test.java
index 1471f3f38b..254636260b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_604Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_604Test.java
@@ -1,12 +1,12 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._604;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _604Test {
-    private static _604.Solution1.StringIterator test;
+    private _604.Solution1.StringIterator test;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_605Test.java b/src/test/java/com/fishercoder/firstthousand/_605Test.java
index 16700d3a55..53a3417083 100644
--- a/src/test/java/com/fishercoder/firstthousand/_605Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_605Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._605;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _605Test {
-    private static _605.Solution1 solution1;
-    private static _605.Solution2 solution2;
+    private _605.Solution1 solution1;
+    private _605.Solution2 solution2;
     private static int[] flowerbed;
     private static int n;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _605.Solution1();
         solution2 = new _605.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_606Test.java b/src/test/java/com/fishercoder/firstthousand/_606Test.java
index 68eada0238..d5afbeae28 100644
--- a/src/test/java/com/fishercoder/firstthousand/_606Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_606Test.java
@@ -3,20 +3,20 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._606;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _606Test {
-    private static _606.Solution1 solution1;
-    private static _606.Solution2 solution2;
+    private _606.Solution1 solution1;
+    private _606.Solution2 solution2;
     private static TreeNode treeNode;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _606.Solution1();
         solution2 = new _606.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_609Test.java b/src/test/java/com/fishercoder/firstthousand/_609Test.java
index b67f4d5c10..c665662557 100644
--- a/src/test/java/com/fishercoder/firstthousand/_609Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_609Test.java
@@ -2,18 +2,18 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._609;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
 public class _609Test {
-    private static _609.Solution1 solution1;
+    private _609.Solution1 solution1;
     private static String[] paths;
     private static List<List<String>> actual;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _609.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_60Test.java b/src/test/java/com/fishercoder/firstthousand/_60Test.java
index 2c75d601bb..c8f49184fd 100644
--- a/src/test/java/com/fishercoder/firstthousand/_60Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_60Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _60Test {
-    private static _60.Solution1 solution1;
+    private _60.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_611Test.java b/src/test/java/com/fishercoder/firstthousand/_611Test.java
index d739cd24af..6691bb15f5 100644
--- a/src/test/java/com/fishercoder/firstthousand/_611Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_611Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _611Test {
-    private static _611.Solution1 solution1;
+    private _611.Solution1 solution1;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_617Test.java b/src/test/java/com/fishercoder/firstthousand/_617Test.java
index 29104f10ee..7a08a7e709 100644
--- a/src/test/java/com/fishercoder/firstthousand/_617Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_617Test.java
@@ -2,19 +2,19 @@
 
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._617;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _617Test {
-    private static _617.Solution1 solution1;
-    private static _617.Solution2 solution2;
+    private _617.Solution1 solution1;
+    private _617.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _617.Solution1();
         solution2 = new _617.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_61Test.java b/src/test/java/com/fishercoder/firstthousand/_61Test.java
index a5fa3fdf24..f86dfdadc5 100644
--- a/src/test/java/com/fishercoder/firstthousand/_61Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_61Test.java
@@ -8,7 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _61Test {
-    private static _61.Solution1 solution1;
+    private _61.Solution1 solution1;
     private static ListNode expected;
     private static ListNode actual;
     private static ListNode head;
diff --git a/src/test/java/com/fishercoder/firstthousand/_621Test.java b/src/test/java/com/fishercoder/firstthousand/_621Test.java
index b76ad02a19..6a81a37b26 100644
--- a/src/test/java/com/fishercoder/firstthousand/_621Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_621Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._621;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _621Test {
-    private static _621.Solution1 solution1;
+    private _621.Solution1 solution1;
     private static char[] tasks;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _621.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_622Test.java b/src/test/java/com/fishercoder/firstthousand/_622Test.java
index 8cd4a8cb42..6d6386a307 100644
--- a/src/test/java/com/fishercoder/firstthousand/_622Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_622Test.java
@@ -1,12 +1,12 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._622;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _622Test {
-    private static _622.Solution1.MyCircularQueue myCircularQueue;
+    private _622.Solution1.MyCircularQueue myCircularQueue;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_623Test.java b/src/test/java/com/fishercoder/firstthousand/_623Test.java
index 3078b74951..50689ea998 100644
--- a/src/test/java/com/fishercoder/firstthousand/_623Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_623Test.java
@@ -3,18 +3,18 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._623;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _623Test {
-    private static _623.Solution1 solution1;
+    private _623.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _623.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_628Test.java b/src/test/java/com/fishercoder/firstthousand/_628Test.java
index 8d671b6f88..79bbdeda5e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_628Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_628Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._628;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _628Test {
-    private static _628.Solution1 solution1;
+    private _628.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _628.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_62Test.java b/src/test/java/com/fishercoder/firstthousand/_62Test.java
index 4109cd7f14..67c4957f2b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_62Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_62Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _62Test {
-    private static _62.Solution1 solution1;
+    private _62.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_630Test.java b/src/test/java/com/fishercoder/firstthousand/_630Test.java
index 77000628eb..90d5fac83d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_630Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_630Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._630;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _630Test {
-    private static _630.Solution1 solution1;
+    private _630.Solution1 solution1;
     private static int[][] courses;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _630.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_631Test.java b/src/test/java/com/fishercoder/firstthousand/_631Test.java
index 1e9fdec99f..5d3e6d30a1 100644
--- a/src/test/java/com/fishercoder/firstthousand/_631Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_631Test.java
@@ -1,12 +1,12 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._631;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _631Test {
-    private static _631.Solution1.Excel excel;
+    private _631.Solution1.Excel excel;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_635Test.java b/src/test/java/com/fishercoder/firstthousand/_635Test.java
index 3cb211b008..147ba94581 100644
--- a/src/test/java/com/fishercoder/firstthousand/_635Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_635Test.java
@@ -1,29 +1,29 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._635;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 9/9/17.
  */
 public class _635Test {
-    private static _635.Solution1.LogSystem logSystem;
+    private _635.Solution1.LogSystem logSystem;
     private static List<Integer> expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         logSystem = new _635.Solution1.LogSystem();
     }
 
-    @Before
+    @BeforeEach
     public void clear() {
         logSystem = new _635.Solution1.LogSystem();
         expected = new ArrayList<>();
diff --git a/src/test/java/com/fishercoder/firstthousand/_636Test.java b/src/test/java/com/fishercoder/firstthousand/_636Test.java
index 4e2c622708..fc14a0ff14 100644
--- a/src/test/java/com/fishercoder/firstthousand/_636Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_636Test.java
@@ -9,7 +9,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _636Test {
-    private static _636.Solution1 solution1;
+    private _636.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_63Test.java b/src/test/java/com/fishercoder/firstthousand/_63Test.java
index 4ce196377a..2909370573 100644
--- a/src/test/java/com/fishercoder/firstthousand/_63Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_63Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _63Test {
-    private static _63.Solution1 solution1;
+    private _63.Solution1 solution1;
     private static int[][] obstacleGrid;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_643Test.java b/src/test/java/com/fishercoder/firstthousand/_643Test.java
index 7c5d6fccd6..29a520ed74 100644
--- a/src/test/java/com/fishercoder/firstthousand/_643Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_643Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._643;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _643Test {
-    private static _643.Solution1 solution1;
+    private _643.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _643.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_645Test.java b/src/test/java/com/fishercoder/firstthousand/_645Test.java
index 29a7a70108..4ea8fedfbd 100644
--- a/src/test/java/com/fishercoder/firstthousand/_645Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_645Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._645;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _645Test {
-    private static _645.Solution1 solution1;
+    private _645.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _645.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_646Test.java b/src/test/java/com/fishercoder/firstthousand/_646Test.java
index 282ac3fb8b..82e32b1b01 100644
--- a/src/test/java/com/fishercoder/firstthousand/_646Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_646Test.java
@@ -9,8 +9,8 @@
 
 public class _646Test {
 
-    private static _646.Solution1 solution1;
-    private static _646.Solution2 solution2;
+    private _646.Solution1 solution1;
+    private _646.Solution2 solution2;
     private static int[][] pairs;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_647Test.java b/src/test/java/com/fishercoder/firstthousand/_647Test.java
index 7873e81ebc..ac6d091b89 100644
--- a/src/test/java/com/fishercoder/firstthousand/_647Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_647Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._647;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _647Test {
-    private static _647.Solution1 solution1;
-    private static _647.Solution2 solution2;
+    private _647.Solution1 solution1;
+    private _647.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _647.Solution1();
         solution2 = new _647.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_648Test.java b/src/test/java/com/fishercoder/firstthousand/_648Test.java
index 657d6b9393..8d445040a6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_648Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_648Test.java
@@ -1,21 +1,21 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._648;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _648Test {
-    private static _648.Solution1 solution1;
+    private _648.Solution1 solution1;
     private static List<String> dict;
     private static String sentence;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _648.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_649Test.java b/src/test/java/com/fishercoder/firstthousand/_649Test.java
index a2f6752cca..67306faa44 100644
--- a/src/test/java/com/fishercoder/firstthousand/_649Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_649Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._649;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 5/8/17.
  */
 public class _649Test {
-    private static _649.Solution1 solution1;
+    private _649.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _649.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_64Test.java b/src/test/java/com/fishercoder/firstthousand/_64Test.java
index 1c319033c3..5bc609f05b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_64Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_64Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _64Test {
-    private static _64.Solution1 solution1;
+    private _64.Solution1 solution1;
     private static int[][] grid;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_650Test.java b/src/test/java/com/fishercoder/firstthousand/_650Test.java
index e74ed63073..47af9635c1 100644
--- a/src/test/java/com/fishercoder/firstthousand/_650Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_650Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._650;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _650Test {
-    private static _650.Solution1 solution1;
+    private _650.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _650.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_651Test.java b/src/test/java/com/fishercoder/firstthousand/_651Test.java
index 895d5df4f7..a428b7dbc7 100644
--- a/src/test/java/com/fishercoder/firstthousand/_651Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_651Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._651;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _651Test {
-    private static _651.Solution1 solution1;
+    private _651.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _651.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_652Test.java b/src/test/java/com/fishercoder/firstthousand/_652Test.java
index af238ed3b0..803310a8a4 100644
--- a/src/test/java/com/fishercoder/firstthousand/_652Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_652Test.java
@@ -2,27 +2,27 @@
 
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.solutions.firstthousand._652;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _652Test {
-    private static _652.Solution1 solution1;
+    private _652.Solution1 solution1;
     private static List<TreeNode> expected;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _652.Solution1();
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         root = null;
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_653Test.java b/src/test/java/com/fishercoder/firstthousand/_653Test.java
index fb34864b14..1301d47f3e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_653Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_653Test.java
@@ -3,26 +3,26 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._653;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _653Test {
-    private static _653.Solution1 solution1;
+    private _653.Solution1 solution1;
     private static boolean expected;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _653.Solution1();
     }
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         root = null;
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_654Test.java b/src/test/java/com/fishercoder/firstthousand/_654Test.java
index 00be641382..a1bec7c212 100644
--- a/src/test/java/com/fishercoder/firstthousand/_654Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_654Test.java
@@ -3,21 +3,21 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._654;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _654Test {
     private static int[] nums;
     private static TreeNode expected;
-    private static _654.Solution1 solution1;
-    private static _654.Solution2 solution2;
+    private _654.Solution1 solution1;
+    private _654.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _654.Solution1();
         solution2 = new _654.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_655Test.java b/src/test/java/com/fishercoder/firstthousand/_655Test.java
index 24e9d902b8..e8072eca8b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_655Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_655Test.java
@@ -4,22 +4,22 @@
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._655;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _655Test {
     private static List<List<String>> expected;
     private static TreeNode root;
-    private static _655.Solution1 solution1;
+    private _655.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _655.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_656Test.java b/src/test/java/com/fishercoder/firstthousand/_656Test.java
index 11a352c310..b78f8a58ef 100644
--- a/src/test/java/com/fishercoder/firstthousand/_656Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_656Test.java
@@ -1,25 +1,25 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._656;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 5/25/17.
  */
 public class _656Test {
-    private static _656.Solution1 solution1;
+    private _656.Solution1 solution1;
     private static int[] A;
     private static List<Integer> expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _656.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_658Test.java b/src/test/java/com/fishercoder/firstthousand/_658Test.java
index ff401becd2..ec95b949db 100644
--- a/src/test/java/com/fishercoder/firstthousand/_658Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_658Test.java
@@ -1,24 +1,24 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._658;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _658Test {
-    private static _658.Solution1 solution1;
+    private _658.Solution1 solution1;
     private static List<Integer> arr;
     private static List<Integer> expected;
     private static int k;
     private static int x;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _658.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_659Test.java b/src/test/java/com/fishercoder/firstthousand/_659Test.java
index 20eb4aa625..de8fbd4aa7 100644
--- a/src/test/java/com/fishercoder/firstthousand/_659Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_659Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._659;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _659Test {
-    private static _659.Solution1 solution1;
+    private _659.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _659.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_65Test.java b/src/test/java/com/fishercoder/firstthousand/_65Test.java
index 109e366944..013ebb40ff 100644
--- a/src/test/java/com/fishercoder/firstthousand/_65Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_65Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _65Test {
-    private static _65.Solution1 solution1;
-    private static _65.Solution2 solution2;
+    private _65.Solution1 solution1;
+    private _65.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_661Test.java b/src/test/java/com/fishercoder/firstthousand/_661Test.java
index f1ab07ab5f..3cb3498d6d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_661Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_661Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._661;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _661Test {
-    private static _661.Solution1 solution1;
+    private _661.Solution1 solution1;
     private static int[][] M;
     private static int[][] expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _661.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_662Test.java b/src/test/java/com/fishercoder/firstthousand/_662Test.java
index 74b8c4bfba..eb3c668e4a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_662Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_662Test.java
@@ -3,21 +3,21 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._662;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _662Test {
-    private static _662.Solution1 solution1;
+    private _662.Solution1 solution1;
     private static TreeNode root;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _662.Solution1();
     }
 
@@ -43,7 +43,7 @@ public void test3() {
     }
 
     @Test
-    @Ignore
+    @Disabled
     /**TODO: need to figure out how to pass in the input for the 4th example on Leetcode*/
     public void test4() {
         root = TreeUtils.constructBinaryTree(Arrays.asList(1, 3, 2, 5, null, null, 9, 6, null, null, null, null, null, null, 7));
diff --git a/src/test/java/com/fishercoder/firstthousand/_663Test.java b/src/test/java/com/fishercoder/firstthousand/_663Test.java
index 1e861c9785..9c7bb59f3d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_663Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_663Test.java
@@ -3,20 +3,20 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._663;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _663Test {
-    private static _663.Solution1 solution1;
+    private _663.Solution1 solution1;
     private static TreeNode root;
     private static boolean expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _663.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_664Test.java b/src/test/java/com/fishercoder/firstthousand/_664Test.java
index c315d8b945..a6af6e9424 100644
--- a/src/test/java/com/fishercoder/firstthousand/_664Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_664Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._664;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _664Test {
-    private static _664.Solution1 solution1;
+    private _664.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _664.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_665Test.java b/src/test/java/com/fishercoder/firstthousand/_665Test.java
index f36a581838..3cfc0a8b40 100644
--- a/src/test/java/com/fishercoder/firstthousand/_665Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_665Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._665;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _665Test {
-    private static _665.Solution1 solution1;
+    private _665.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _665.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_666Test.java b/src/test/java/com/fishercoder/firstthousand/_666Test.java
index dc06450a4d..a862e44d1f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_666Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_666Test.java
@@ -1,24 +1,24 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._666;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _666Test {
-    private static _666.Solution1 solution1;
-    private static _666.Solution2 solution2;
+    private _666.Solution1 solution1;
+    private _666.Solution2 solution2;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _666.Solution1();
         solution2 = new _666.Solution2();
     }
 
-    @Before
+    @BeforeEach
     public void cleanUp() {
         solution1.totalSum = 0;
         solution2.totalSum = 0;
diff --git a/src/test/java/com/fishercoder/firstthousand/_667Test.java b/src/test/java/com/fishercoder/firstthousand/_667Test.java
index 7482cd3c3a..3c1b97144a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_667Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_667Test.java
@@ -2,18 +2,18 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._667;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _667Test {
-    private static _667.Solutoin1 solution1;
-    private static _667.Solutoin2 solution2;
+    private _667.Solutoin1 solution1;
+    private _667.Solutoin2 solution2;
     private static int[] expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _667.Solutoin1();
         solution2 = new _667.Solutoin2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_668Test.java b/src/test/java/com/fishercoder/firstthousand/_668Test.java
index 7910697cc9..3e0ad97118 100644
--- a/src/test/java/com/fishercoder/firstthousand/_668Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_668Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._668;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _668Test {
-    private static _668.Solution1 solution1;
-    private static _668.Solution2 solution2;
+    private _668.Solution1 solution1;
+    private _668.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _668.Solution1();
         solution2 = new _668.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_669Test.java b/src/test/java/com/fishercoder/firstthousand/_669Test.java
index 508a6a5495..77b7b5e7e3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_669Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_669Test.java
@@ -3,20 +3,20 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._669;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _669Test {
-    private static _669.Solution1 solution1;
+    private _669.Solution1 solution1;
     private static TreeNode root;
     private static TreeNode expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _669.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_66Test.java b/src/test/java/com/fishercoder/firstthousand/_66Test.java
index 1f01e4b561..a6a2cc78c6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_66Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_66Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _66Test {
-    private static _66.Solution1 solution1;
-    private static _66.Solution2 solution2;
+    private _66.Solution1 solution1;
+    private _66.Solution2 solution2;
     private static int[] digits;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_670Test.java b/src/test/java/com/fishercoder/firstthousand/_670Test.java
index 72868c3412..ae613621e9 100644
--- a/src/test/java/com/fishercoder/firstthousand/_670Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_670Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._670;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _670Test {
-    private static _670.Solution1 solution1;
+    private _670.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _670.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_671Test.java b/src/test/java/com/fishercoder/firstthousand/_671Test.java
index 1e21e57533..ff86d281e3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_671Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_671Test.java
@@ -3,19 +3,19 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._671;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _671Test {
-    private static _671.Solution1 solution1;
+    private _671.Solution1 solution1;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _671.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_672Test.java b/src/test/java/com/fishercoder/firstthousand/_672Test.java
index 89c823db54..2a8ab83d10 100644
--- a/src/test/java/com/fishercoder/firstthousand/_672Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_672Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._672;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _672Test {
-    private static _672.Solution1 solution1;
-    private static _672.Solution2 solution2;
+    private _672.Solution1 solution1;
+    private _672.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _672.Solution1();
         solution2 = new _672.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_673Test.java b/src/test/java/com/fishercoder/firstthousand/_673Test.java
index 69d9fbbab4..59485a5044 100644
--- a/src/test/java/com/fishercoder/firstthousand/_673Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_673Test.java
@@ -1,23 +1,23 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._673;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _673Test {
-    private static _673.Solution1 solution1;
+    private _673.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _673.Solution1();
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void test1() {
         nums = new int[]{1, 3, 5, 4, 7};
         assertEquals(2, solution1.findNumberOfLIS(nums));
diff --git a/src/test/java/com/fishercoder/firstthousand/_674Test.java b/src/test/java/com/fishercoder/firstthousand/_674Test.java
index cd8dcecb34..fb996742fa 100644
--- a/src/test/java/com/fishercoder/firstthousand/_674Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_674Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._674;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _674Test {
-    private static _674.Solution1 solution1;
+    private _674.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _674.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_675Test.java b/src/test/java/com/fishercoder/firstthousand/_675Test.java
index f7436b71e1..a658af3fb4 100644
--- a/src/test/java/com/fishercoder/firstthousand/_675Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_675Test.java
@@ -2,21 +2,21 @@
 
 import com.fishercoder.common.utils.ArrayUtils;
 import com.fishercoder.solutions.firstthousand._675;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _675Test {
-    private static _675.Solution1 solution1;
+    private _675.Solution1 solution1;
     private static List<List<Integer>> forest;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _675.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_676Test.java b/src/test/java/com/fishercoder/firstthousand/_676Test.java
index a48d1993d4..b2919984b3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_676Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_676Test.java
@@ -1,21 +1,21 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._676;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _676Test {
-    private static _676.Solution1.MagicDictionary magicDictionarySol1;
+    private _676.Solution1.MagicDictionary magicDictionarySol1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         magicDictionarySol1 = new _676.Solution1.MagicDictionary();
     }
 
-    @Before
+    @BeforeEach
     public void cleanup() {
         magicDictionarySol1 = new _676.Solution1.MagicDictionary();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_678Test.java b/src/test/java/com/fishercoder/firstthousand/_678Test.java
index 2d41a61d80..e2ee9698d6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_678Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_678Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._678;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _678Test {
-    private static _678.Solution1 solution1;
-    private static _678.Solution2 solution2;
-    private static _678.Solution3 solution3;
+    private _678.Solution1 solution1;
+    private _678.Solution2 solution2;
+    private _678.Solution3 solution3;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _678.Solution1();
         solution2 = new _678.Solution2();
         solution3 = new _678.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_679Test.java b/src/test/java/com/fishercoder/firstthousand/_679Test.java
index 74e83f6d23..4f7abf670c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_679Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_679Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._679;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _679Test {
-    private static _679.Solution1 solution1;
+    private _679.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _679.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_67Test.java b/src/test/java/com/fishercoder/firstthousand/_67Test.java
index 75d68f0128..2a8483b2d2 100644
--- a/src/test/java/com/fishercoder/firstthousand/_67Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_67Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _67Test {
-    private static _67.Solution1 solution1;
+    private _67.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_680Test.java b/src/test/java/com/fishercoder/firstthousand/_680Test.java
index b49c10c4ad..59189d193a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_680Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_680Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._680;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _680Test {
-    private static _680.Solution1 solution1;
-    private static _680.Solution2 solution2;
+    private _680.Solution1 solution1;
+    private _680.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _680.Solution1();
         solution2 = new _680.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_681Test.java b/src/test/java/com/fishercoder/firstthousand/_681Test.java
index 7e17b0b913..afcb9304e1 100644
--- a/src/test/java/com/fishercoder/firstthousand/_681Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_681Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._681;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _681Test {
-    private static _681.Solution1 solution1;
+    private _681.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _681.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_682Test.java b/src/test/java/com/fishercoder/firstthousand/_682Test.java
index 4ae958d44b..e127035af4 100644
--- a/src/test/java/com/fishercoder/firstthousand/_682Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_682Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._682;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _682Test {
-    private static _682.Solution1 solution1;
+    private _682.Solution1 solution1;
     private static String[] ops;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _682.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_683Test.java b/src/test/java/com/fishercoder/firstthousand/_683Test.java
index c4532d88ba..ec388c46ba 100644
--- a/src/test/java/com/fishercoder/firstthousand/_683Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_683Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._683;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _683Test {
-    private static _683.Solution1 solution1;
+    private _683.Solution1 solution1;
     private static int[] flowers;
     private static int k;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _683.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_684Test.java b/src/test/java/com/fishercoder/firstthousand/_684Test.java
index 0be7c04657..78d2a8b99b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_684Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_684Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _684Test {
-    private static _684.Solution1 solution1;
+    private _684.Solution1 solution1;
     private static int[][] edges;
     private static int[] expected;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_685Test.java b/src/test/java/com/fishercoder/firstthousand/_685Test.java
index 73f3180290..937111c7e1 100644
--- a/src/test/java/com/fishercoder/firstthousand/_685Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_685Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._685;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _685Test {
-    private static _685.Solution1 solution1;
-    private static _685.Solution2 solution2;
+    private _685.Solution1 solution1;
+    private _685.Solution2 solution2;
     private static int[][] edges;
     private static int[] expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _685.Solution1();
         solution2 = new _685.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_686Test.java b/src/test/java/com/fishercoder/firstthousand/_686Test.java
index cd84a26ffb..0d7091486f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_686Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_686Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._686;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _686Test {
-    private static _686.Solution1 solution1;
-    private static _686.Solution2 solution2;
+    private _686.Solution1 solution1;
+    private _686.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _686.Solution1();
         solution2 = new _686.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_687Test.java b/src/test/java/com/fishercoder/firstthousand/_687Test.java
index d005b00cd4..fb745b8b95 100644
--- a/src/test/java/com/fishercoder/firstthousand/_687Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_687Test.java
@@ -3,18 +3,18 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._687;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _687Test {
-    private static _687.Solution1 solution1;
+    private _687.Solution1 solution1;
     private static TreeNode root;
 
-    @Before
+    @BeforeEach
     public void setup() {
         solution1 = new _687.Solution1();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_688Test.java b/src/test/java/com/fishercoder/firstthousand/_688Test.java
index 71a5c483f4..7f5e29f275 100644
--- a/src/test/java/com/fishercoder/firstthousand/_688Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_688Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._688;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class _688Test {
-    private static _688.Solution1 solution1;
-    private static _688.Solution2 solution2;
+    private _688.Solution1 solution1;
+    private _688.Solution2 solution2;
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         solution1 = new _688.Solution1();
         solution2 = new _688.Solution2();
diff --git a/src/test/java/com/fishercoder/firstthousand/_689Test.java b/src/test/java/com/fishercoder/firstthousand/_689Test.java
index 7f5a1d9901..18e375517d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_689Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_689Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._689;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _689Test {
-    private static _689.Solution1 solution1;
+    private _689.Solution1 solution1;
     private static int[] nums;
     private static int[] expected;
     private static int k;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _689.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_68Test.java b/src/test/java/com/fishercoder/firstthousand/_68Test.java
index 8e2e526327..11003b7ade 100644
--- a/src/test/java/com/fishercoder/firstthousand/_68Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_68Test.java
@@ -9,7 +9,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _68Test {
-    private static _68.Solution1 solution1;
+    private _68.Solution1 solution1;
     private static String[] words;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_690Test.java b/src/test/java/com/fishercoder/firstthousand/_690Test.java
index 856c47b8a0..e2e21919e4 100644
--- a/src/test/java/com/fishercoder/firstthousand/_690Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_690Test.java
@@ -2,24 +2,24 @@
 
 import com.fishercoder.common.classes.Employee;
 import com.fishercoder.solutions.firstthousand._690;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 5/18/17.
  */
 public class _690Test {
-    private static _690.Solution1 solution1;
+    private _690.Solution1 solution1;
     private static List<Employee> employees;
     private static int id;
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         solution1 = new _690.Solution1();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_692Test.java b/src/test/java/com/fishercoder/firstthousand/_692Test.java
index 1462b0b3ac..ce2b958e7d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_692Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_692Test.java
@@ -1,23 +1,23 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._692;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _692Test {
-    private static _692.Solution1 solution1;
+    private _692.Solution1 solution1;
     private static String[] words;
     private static List<String> expected;
     private static List<String> actual;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _692.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_694Test.java b/src/test/java/com/fishercoder/firstthousand/_694Test.java
index 05d6599d82..d2438f6e77 100644
--- a/src/test/java/com/fishercoder/firstthousand/_694Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_694Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._694;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _694Test {
-    private static _694.Solution1 solution1;
+    private _694.Solution1 solution1;
     private static int[][] grid;
 
-    @Before
+    @BeforeEach
     public void setup() {
         solution1 = new _694.Solution1();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_695Test.java b/src/test/java/com/fishercoder/firstthousand/_695Test.java
index 2b09e95dea..26abce0bea 100644
--- a/src/test/java/com/fishercoder/firstthousand/_695Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_695Test.java
@@ -2,17 +2,17 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._695;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _695Test {
-    private static _695.Solution1 solution1;
-    private static _695.Solution2 solution2;
+    private _695.Solution1 solution1;
+    private _695.Solution2 solution2;
     private static int[][] grid;
 
-    @Before
+    @BeforeEach
     public void setup() {
         solution1 = new _695.Solution1();
         solution2 = new _695.Solution2();
diff --git a/src/test/java/com/fishercoder/firstthousand/_697Test.java b/src/test/java/com/fishercoder/firstthousand/_697Test.java
index bff422ca65..088e82c883 100644
--- a/src/test/java/com/fishercoder/firstthousand/_697Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_697Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._697;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _697Test {
-    private static _697.Solution1 solution1;
-    private static _697.Solution2 solution2;
-    private static _697.Solution3 solution3;
+    private _697.Solution1 solution1;
+    private _697.Solution2 solution2;
+    private _697.Solution3 solution3;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _697.Solution1();
         solution2 = new _697.Solution2();
         solution3 = new _697.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_698Test.java b/src/test/java/com/fishercoder/firstthousand/_698Test.java
index 1b1d6ebb69..9a76bd2156 100644
--- a/src/test/java/com/fishercoder/firstthousand/_698Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_698Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._698;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _698Test {
-    private static _698.Solution1 solution1;
-    private static _698.Solution2 solution2;
+    private _698.Solution1 solution1;
+    private _698.Solution2 solution2;
     private static int[] nums;
     private static int k;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _698.Solution1();
         solution2 = new _698.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_699Test.java b/src/test/java/com/fishercoder/firstthousand/_699Test.java
index abddebf343..4cb8f5e936 100644
--- a/src/test/java/com/fishercoder/firstthousand/_699Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_699Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._699;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _699Test {
-    private static _699.Solution1 solution1;
+    private _699.Solution1 solution1;
     private static int[][] positions;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _699.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_69Test.java b/src/test/java/com/fishercoder/firstthousand/_69Test.java
index 8d965f06a8..92bb2f11d8 100644
--- a/src/test/java/com/fishercoder/firstthousand/_69Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_69Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _69Test {
-    private static _69.Solution1 solution1;
+    private _69.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_6Test.java b/src/test/java/com/fishercoder/firstthousand/_6Test.java
index 5afeec079e..ff6020596e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_6Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_6Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _6Test {
-    private static _6.Solution1 solution1;
+    private _6.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_700Test.java b/src/test/java/com/fishercoder/firstthousand/_700Test.java
index 3afd9de652..13bbc14969 100644
--- a/src/test/java/com/fishercoder/firstthousand/_700Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_700Test.java
@@ -3,20 +3,20 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._700;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _700Test {
-    private static _700.Solution1 solution1;
+    private _700.Solution1 solution1;
     private static TreeNode root;
     private static TreeNode expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _700.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_701Test.java b/src/test/java/com/fishercoder/firstthousand/_701Test.java
index 623a53ce81..cba340c352 100644
--- a/src/test/java/com/fishercoder/firstthousand/_701Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_701Test.java
@@ -3,17 +3,17 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._701;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
 public class _701Test {
-    private static _701.Solution1 solution1;
-    private static _701.Solution2 solution2;
+    private _701.Solution1 solution1;
+    private _701.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _701.Solution1();
         solution2 = new _701.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_703Test.java b/src/test/java/com/fishercoder/firstthousand/_703Test.java
index 0c4d1c9834..fa68b2cac2 100644
--- a/src/test/java/com/fishercoder/firstthousand/_703Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_703Test.java
@@ -1,12 +1,12 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._703;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _703Test {
-  private static _703.Solution1.KthLargest solution1;
+  private _703.Solution1.KthLargest solution1;
   private static int[] A;
 
   @Test
diff --git a/src/test/java/com/fishercoder/firstthousand/_704Test.java b/src/test/java/com/fishercoder/firstthousand/_704Test.java
index 9e8ec42ef1..42aa4313eb 100644
--- a/src/test/java/com/fishercoder/firstthousand/_704Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_704Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._704;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _704Test {
-    private static _704.Solution1 solution1;
-    private static _704.Solution2 solution2;
+    private _704.Solution1 solution1;
+    private _704.Solution2 solution2;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _704.Solution1();
         solution2 = new _704.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_706Test.java b/src/test/java/com/fishercoder/firstthousand/_706Test.java
index ae323662b1..71ec5bd65a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_706Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_706Test.java
@@ -1,12 +1,12 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._706;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _706Test {
-    private static _706.Solution2.MyHashMap myHashMap;
+    private _706.Solution2.MyHashMap myHashMap;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_709Test.java b/src/test/java/com/fishercoder/firstthousand/_709Test.java
index e87943fcfd..e607a20279 100644
--- a/src/test/java/com/fishercoder/firstthousand/_709Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_709Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._709;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _709Test {
-    private static _709.Solution1 solution1;
+    private _709.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _709.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_70Test.java b/src/test/java/com/fishercoder/firstthousand/_70Test.java
index c78179c440..c1d81b6f9d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_70Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_70Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _70Test {
-    private static _70.Solution1 solution1;
-    private static _70.Solution2 solution2;
+    private _70.Solution1 solution1;
+    private _70.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_712Test.java b/src/test/java/com/fishercoder/firstthousand/_712Test.java
index ee5efbbd91..7fd8080f7f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_712Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_712Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._712;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _712Test {
-    private static _712.Solution1 solution1;
+    private _712.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _712.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_713Test.java b/src/test/java/com/fishercoder/firstthousand/_713Test.java
index e9eede0e9e..289dfb8a76 100644
--- a/src/test/java/com/fishercoder/firstthousand/_713Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_713Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _713Test {
-    private static _713.Solution1 solution1;
+    private _713.Solution1 solution1;
     private static int[] nums;
     private static int k;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_714Test.java b/src/test/java/com/fishercoder/firstthousand/_714Test.java
index 6a9a76d2a6..2779781f15 100644
--- a/src/test/java/com/fishercoder/firstthousand/_714Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_714Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._714;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _714Test {
-    private static _714.Solution1 solution1;
-    private static _714.Solution2 solution2;
+    private _714.Solution1 solution1;
+    private _714.Solution2 solution2;
     private static int[] prices;
     private static int fee;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _714.Solution1();
         solution2 = new _714.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_716Test.java b/src/test/java/com/fishercoder/firstthousand/_716Test.java
index e1102897c1..a7fb187a81 100644
--- a/src/test/java/com/fishercoder/firstthousand/_716Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_716Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._716;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _716Test {
-    private static _716.Solution1.MaxStack maxStackSolution1;
-    private static _716.Solution2.MaxStack maxStackSolution2;
-    private static _716.Solution3.MaxStack maxStackSolution3;
+    private _716.Solution1.MaxStack maxStackSolution1;
+    private _716.Solution2.MaxStack maxStackSolution2;
+    private _716.Solution3.MaxStack maxStackSolution3;
 
-    @Before
+    @BeforeEach
     public void setup() {
         maxStackSolution1 = new _716.Solution1.MaxStack();
         maxStackSolution2 = new _716.Solution2.MaxStack();
diff --git a/src/test/java/com/fishercoder/firstthousand/_718Test.java b/src/test/java/com/fishercoder/firstthousand/_718Test.java
index 5126001393..dc1d6bd61a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_718Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_718Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._718;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _718Test {
-    private static _718.Solution1 solution1;
-    private static _718.Solution2 solution2;
+    private _718.Solution1 solution1;
+    private _718.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _718.Solution1();
         solution2 = new _718.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_719Test.java b/src/test/java/com/fishercoder/firstthousand/_719Test.java
index 0aa377cedf..c0ef73eec3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_719Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_719Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._719;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _719Test {
-    private static _719.Solution1 solution1;
-    private static _719.Solution2 solution2;
+    private _719.Solution1 solution1;
+    private _719.Solution2 solution2;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _719.Solution1();
         solution2 = new _719.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_71Test.java b/src/test/java/com/fishercoder/firstthousand/_71Test.java
index 2dfc8b1b8d..8dd5909874 100644
--- a/src/test/java/com/fishercoder/firstthousand/_71Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_71Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _71Test {
-    private static _71.Solution1 solution1;
-    private static _71.Solution2 solution2;
+    private _71.Solution1 solution1;
+    private _71.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_720Test.java b/src/test/java/com/fishercoder/firstthousand/_720Test.java
index 2b0b5629ef..a824da926f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_720Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_720Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._720;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _720Test {
-    private static _720.Solution1 solution1;
+    private _720.Solution1 solution1;
     private static String[] words;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _720.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_721Test.java b/src/test/java/com/fishercoder/firstthousand/_721Test.java
index 7363aeb589..7d451cf4bd 100644
--- a/src/test/java/com/fishercoder/firstthousand/_721Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_721Test.java
@@ -9,8 +9,8 @@
 import java.util.List;
 
 public class _721Test {
-    private static _721.Solution1 solution1;
-    private static _721.Solution2 solution2;
+    private _721.Solution1 solution1;
+    private _721.Solution2 solution2;
     private static List<List<String>> accounts;
     private static List<List<String>> expected;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_722Test.java b/src/test/java/com/fishercoder/firstthousand/_722Test.java
index e06307d85f..fde96c8fe8 100644
--- a/src/test/java/com/fishercoder/firstthousand/_722Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_722Test.java
@@ -9,7 +9,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _722Test {
-    private static _722.Solution1 solution1;
+    private _722.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_723Test.java b/src/test/java/com/fishercoder/firstthousand/_723Test.java
index 2a982f6529..83c2109480 100644
--- a/src/test/java/com/fishercoder/firstthousand/_723Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_723Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._723;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _723Test {
-    private static _723.Solution1 solution1;
+    private _723.Solution1 solution1;
     private static int[][] board;
     private static int[][] expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _723.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_724Test.java b/src/test/java/com/fishercoder/firstthousand/_724Test.java
index e5ebd6ca54..ffe5cb0aae 100644
--- a/src/test/java/com/fishercoder/firstthousand/_724Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_724Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._724;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _724Test {
-    private static _724.Solution1 solution1;
-    private static _724.Solution2 solution2;
+    private _724.Solution1 solution1;
+    private _724.Solution2 solution2;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _724.Solution1();
         solution2 = new _724.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_725Test.java b/src/test/java/com/fishercoder/firstthousand/_725Test.java
index 50ea7117bf..7df7589e92 100644
--- a/src/test/java/com/fishercoder/firstthousand/_725Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_725Test.java
@@ -3,18 +3,18 @@
 import com.fishercoder.common.classes.ListNode;
 import com.fishercoder.common.utils.LinkedListUtils;
 import com.fishercoder.solutions.firstthousand._725;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _725Test {
-    private static _725.Solution1 solution1;
-    private static _725.Solution2 solution2;
+    private _725.Solution1 solution1;
+    private _725.Solution2 solution2;
     private static ListNode root;
     private static int k;
     private static ListNode[] actual;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _725.Solution1();
         solution2 = new _725.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_726Test.java b/src/test/java/com/fishercoder/firstthousand/_726Test.java
index 32d555e1c3..347b05dae7 100644
--- a/src/test/java/com/fishercoder/firstthousand/_726Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_726Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _726Test {
-    private static _726.Solution1 solution1;
+    private _726.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_727Test.java b/src/test/java/com/fishercoder/firstthousand/_727Test.java
index bf5307b515..142ee8584f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_727Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_727Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._727;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _727Test {
-    private static _727.Solution1 solution1;
-    private static _727.Solution2 solution2;
+    private _727.Solution1 solution1;
+    private _727.Solution2 solution2;
     private static String S;
     private static String T;
 
-    @Before
+    @BeforeEach
     public void setup() {
         solution1 = new _727.Solution1();
         solution2 = new _727.Solution2();
diff --git a/src/test/java/com/fishercoder/firstthousand/_728Test.java b/src/test/java/com/fishercoder/firstthousand/_728Test.java
index 74d1da8baf..ab27e28d07 100644
--- a/src/test/java/com/fishercoder/firstthousand/_728Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_728Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._728;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _728Test {
-    private static _728.Solution1 solution1;
+    private _728.Solution1 solution1;
     private static List<Integer> expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _728.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_72Test.java b/src/test/java/com/fishercoder/firstthousand/_72Test.java
index c2bcce33c8..3464acfe4e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_72Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_72Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _72Test {
-    private static _72.Solution1 solution1;
-    private static _72.Solution2 solution2;
+    private _72.Solution1 solution1;
+    private _72.Solution2 solution2;
 
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_733Test.java b/src/test/java/com/fishercoder/firstthousand/_733Test.java
index cf4ba8adb2..be8e06fd4b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_733Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_733Test.java
@@ -2,16 +2,16 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._733;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _733Test {
-    private static _733.Solution1 solution1;
+    private _733.Solution1 solution1;
     private static int[][] image;
     private static int[][] result;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _733.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_734Test.java b/src/test/java/com/fishercoder/firstthousand/_734Test.java
index a4d43c7c53..42c942cf9a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_734Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_734Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._734;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _734Test {
-    private static _734.Solution1 solution1;
+    private _734.Solution1 solution1;
     private static String[] words1;
     private static String[] words2;
     private static String[][] pairs;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _734.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_735Test.java b/src/test/java/com/fishercoder/firstthousand/_735Test.java
index b88ff43575..0cd081bd7b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_735Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_735Test.java
@@ -7,10 +7,10 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _735Test {
-    private static _735.Solution1 solution1;
-    private static _735.Solution2 solution2;
-    private static _735.Solution3 solution3;
-    private static _735.Solution4 solution4;
+    private _735.Solution1 solution1;
+    private _735.Solution2 solution2;
+    private _735.Solution3 solution3;
+    private _735.Solution4 solution4;
     private static int[] asteroids;
     private static int[] expected;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_737Test.java b/src/test/java/com/fishercoder/firstthousand/_737Test.java
index 844b858658..544779969e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_737Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_737Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._737;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _737Test {
-    private static _737.Solution1 solution1;
+    private _737.Solution1 solution1;
     private static String[] words1;
     private static String[] words2;
     private static String[][] pairs;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _737.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_738Test.java b/src/test/java/com/fishercoder/firstthousand/_738Test.java
index 273efb8621..18f4199b18 100644
--- a/src/test/java/com/fishercoder/firstthousand/_738Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_738Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._738;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _738Test {
-    private static _738.Solution1 solution1;
+    private _738.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _738.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_739Test.java b/src/test/java/com/fishercoder/firstthousand/_739Test.java
index 3ec2a3a551..8126c2c132 100644
--- a/src/test/java/com/fishercoder/firstthousand/_739Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_739Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._739;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _739Test {
-    private static _739.Solution1 solution1;
+    private _739.Solution1 solution1;
     private static int[] temperatures;
     private static int[] expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _739.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_73Test.java b/src/test/java/com/fishercoder/firstthousand/_73Test.java
index ebc66ceda1..81c523a77d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_73Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_73Test.java
@@ -7,10 +7,10 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _73Test {
-    private static _73.Solution1 solution1;
-    private static _73.Solution2 solution2;
-    private static _73.Solution3 solution3;
-    private static _73.Solution4 solution4;
+    private _73.Solution1 solution1;
+    private _73.Solution2 solution2;
+    private _73.Solution3 solution3;
+    private _73.Solution4 solution4;
     private static int[][] matrix;
     private static int[][] expected;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_740Test.java b/src/test/java/com/fishercoder/firstthousand/_740Test.java
index f1e9b3d74d..fbff143274 100644
--- a/src/test/java/com/fishercoder/firstthousand/_740Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_740Test.java
@@ -7,9 +7,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _740Test {
-    private static _740.Solution1 solution1;
-    private static _740.Solution2 solution2;
-    private static _740.Solution3 solution3;
+    private _740.Solution1 solution1;
+    private _740.Solution2 solution2;
+    private _740.Solution3 solution3;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_742Test.java b/src/test/java/com/fishercoder/firstthousand/_742Test.java
index 35dc1951f6..e2b32fb94f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_742Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_742Test.java
@@ -3,19 +3,19 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._742;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _742Test {
-    private static _742.Solution1 solution1;
+    private _742.Solution1 solution1;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _742.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_743Test.java b/src/test/java/com/fishercoder/firstthousand/_743Test.java
index f3274b6173..efc503f3c4 100644
--- a/src/test/java/com/fishercoder/firstthousand/_743Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_743Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._743;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _743Test {
-    private static _743.Solution1 solution1;
+    private _743.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _743.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_744Test.java b/src/test/java/com/fishercoder/firstthousand/_744Test.java
index aad5642400..36a9ea0900 100644
--- a/src/test/java/com/fishercoder/firstthousand/_744Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_744Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._744;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _744Test {
-    private static _744.Solution1 solution1;
+    private _744.Solution1 solution1;
     private static char[] letters;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _744.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_746Test.java b/src/test/java/com/fishercoder/firstthousand/_746Test.java
index cbd402011d..3427d50571 100644
--- a/src/test/java/com/fishercoder/firstthousand/_746Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_746Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._746;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _746Test {
-  private static _746.Solution1 solution1;
+  private _746.Solution1 solution1;
   private static int[] cost;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _746.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_747Test.java b/src/test/java/com/fishercoder/firstthousand/_747Test.java
index f1fcc64d66..e1c705ac41 100644
--- a/src/test/java/com/fishercoder/firstthousand/_747Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_747Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._747;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _747Test {
-  private static _747.Solution1 solution1;
-  private static _747.Solution2 solution2;
+  private _747.Solution1 solution1;
+  private _747.Solution2 solution2;
   private static int[] nums;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _747.Solution1();
     solution2 = new _747.Solution2();
   }
diff --git a/src/test/java/com/fishercoder/firstthousand/_748Test.java b/src/test/java/com/fishercoder/firstthousand/_748Test.java
index 2268b26691..f13cbbea35 100644
--- a/src/test/java/com/fishercoder/firstthousand/_748Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_748Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._748;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _748Test {
-  private static _748.Solution1 solution1;
+  private _748.Solution1 solution1;
   private static String[] words;
   private static String licensePlate;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _748.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_74Test.java b/src/test/java/com/fishercoder/firstthousand/_74Test.java
index 08991909d0..c57e6a0592 100644
--- a/src/test/java/com/fishercoder/firstthousand/_74Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_74Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _74Test {
-    private static _74.Solution1 solution1;
+    private _74.Solution1 solution1;
     private static int target;
     private static int[][] matrix;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_750Test.java b/src/test/java/com/fishercoder/firstthousand/_750Test.java
index 018ae69965..4e9ed9c9d4 100644
--- a/src/test/java/com/fishercoder/firstthousand/_750Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_750Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._750;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _750Test {
-  private static _750.Solution1 solution1;
+  private _750.Solution1 solution1;
   private static int[][] grid;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _750.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_752Test.java b/src/test/java/com/fishercoder/firstthousand/_752Test.java
index 22a70a89d2..21da84d823 100644
--- a/src/test/java/com/fishercoder/firstthousand/_752Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_752Test.java
@@ -4,10 +4,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _752Test {
-    private static _752.Solution1 solution1;
+    private _752.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_754Test.java b/src/test/java/com/fishercoder/firstthousand/_754Test.java
index 72124209e0..b0e1ffecc8 100644
--- a/src/test/java/com/fishercoder/firstthousand/_754Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_754Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._754;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _754Test {
-  private static _754.Solution1 solution1;
+  private _754.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _754.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_755Test.java b/src/test/java/com/fishercoder/firstthousand/_755Test.java
index 0a44d3fe60..cad5067bf6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_755Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_755Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._755;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _755Test {
-  private static _755.Solution1 solution1;
+  private _755.Solution1 solution1;
   private static int[] heights;
   private static int[] expected;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _755.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_756Test.java b/src/test/java/com/fishercoder/firstthousand/_756Test.java
index b88b13dc6c..9da0fe5ad1 100644
--- a/src/test/java/com/fishercoder/firstthousand/_756Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_756Test.java
@@ -3,17 +3,17 @@
 import com.fishercoder.solutions.firstthousand._756;
 import java.util.Arrays;
 import java.util.List;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _756Test {
-  private static _756.Solution1 solution1;
+  private _756.Solution1 solution1;
   private static List<String> allowed;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _756.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_757Test.java b/src/test/java/com/fishercoder/firstthousand/_757Test.java
index bf1c44aabb..c4a4e6f099 100644
--- a/src/test/java/com/fishercoder/firstthousand/_757Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_757Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._757;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _757Test {
-    private static _757.Solution solution;
+    private _757.Solution solution;
     int[][] intervals;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution = new _757.Solution();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_758Test.java b/src/test/java/com/fishercoder/firstthousand/_758Test.java
index 9969940034..44500ae6a4 100644
--- a/src/test/java/com/fishercoder/firstthousand/_758Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_758Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._758;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _758Test {
-  private static _758.Solution1 solution1;
+  private _758.Solution1 solution1;
   private static String[] words;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _758.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_75Test.java b/src/test/java/com/fishercoder/firstthousand/_75Test.java
index e060d146f8..b3dfab4c76 100644
--- a/src/test/java/com/fishercoder/firstthousand/_75Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_75Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _75Test {
-    private static _75.Solution1 solution1;
+    private _75.Solution1 solution1;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_760Test.java b/src/test/java/com/fishercoder/firstthousand/_760Test.java
index d8f9772ddc..087c0e0dd8 100644
--- a/src/test/java/com/fishercoder/firstthousand/_760Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_760Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._760;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _760Test {
-  private static _760.Solution1 solution1;
+  private _760.Solution1 solution1;
   private static int[] A;
   private static int[] B;
   private static int[] expected;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _760.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_762Test.java b/src/test/java/com/fishercoder/firstthousand/_762Test.java
index ecb4f3a451..42eb86399e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_762Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_762Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._762;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _762Test {
-  private static _762.Solution1 solution1;
+  private _762.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _762.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_763Test.java b/src/test/java/com/fishercoder/firstthousand/_763Test.java
index 41e104fc18..4c1059ce28 100644
--- a/src/test/java/com/fishercoder/firstthousand/_763Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_763Test.java
@@ -5,19 +5,19 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _763Test {
-    private static _763.Solution1 solution1;
-    private static _763.Solution2 solution2;
+    private _763.Solution1 solution1;
+    private _763.Solution2 solution2;
     private static List<Integer> expected;
     private static String s;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _763.Solution1();
         solution2 = new _763.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_764Test.java b/src/test/java/com/fishercoder/firstthousand/_764Test.java
index ac8e1691f7..1483e0ef8e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_764Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_764Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._764;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _764Test {
-    private static _764.Solution1 solution1;
-    private static _764.Solution2 solution2;
+    private _764.Solution1 solution1;
+    private _764.Solution2 solution2;
     private static int[][] mines;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _764.Solution1();
         solution2 = new _764.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_765Test.java b/src/test/java/com/fishercoder/firstthousand/_765Test.java
index f1f8017a44..43fe6dccf7 100644
--- a/src/test/java/com/fishercoder/firstthousand/_765Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_765Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._765;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _765Test {
-  private static _765.Solution1 solution1;
+  private _765.Solution1 solution1;
   private static int[] row;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _765.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_766Test.java b/src/test/java/com/fishercoder/firstthousand/_766Test.java
index e3d6500076..30c5b9acf8 100644
--- a/src/test/java/com/fishercoder/firstthousand/_766Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_766Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _766Test {
-    private static _766.Solution1 solution1;
+    private _766.Solution1 solution1;
     private static int[][] matrix;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_767Test.java b/src/test/java/com/fishercoder/firstthousand/_767Test.java
index fed39cb563..f82e6ba1a8 100644
--- a/src/test/java/com/fishercoder/firstthousand/_767Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_767Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._767;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _767Test {
-    private static _767.Solution1 solution1;
-    private static _767.Solution2 solution2;
+    private _767.Solution1 solution1;
+    private _767.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _767.Solution1();
         solution2 = new _767.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_769Test.java b/src/test/java/com/fishercoder/firstthousand/_769Test.java
index 3d6a254c40..fee8704950 100644
--- a/src/test/java/com/fishercoder/firstthousand/_769Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_769Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._769;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _769Test {
-  private static _769.Solution1 solution1;
-  private static _769.Solution2 solution2;
+  private _769.Solution1 solution1;
+  private _769.Solution2 solution2;
   private static int[] arr;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _769.Solution1();
     solution2 = new _769.Solution2();
   }
diff --git a/src/test/java/com/fishercoder/firstthousand/_76Test.java b/src/test/java/com/fishercoder/firstthousand/_76Test.java
index 37daf3c934..eda894578a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_76Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_76Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _76Test {
-    private static _76.Solution1 solution1;
-    private static _76.Solution2 solution2;
+    private _76.Solution1 solution1;
+    private _76.Solution2 solution2;
     private static String expected;
     private static String s;
     private static String t;
diff --git a/src/test/java/com/fishercoder/firstthousand/_771Test.java b/src/test/java/com/fishercoder/firstthousand/_771Test.java
index 26fca57308..8355a405cf 100644
--- a/src/test/java/com/fishercoder/firstthousand/_771Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_771Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._771;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _771Test {
-  private static _771.Solution1 solution1;
+  private _771.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _771.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_773Test.java b/src/test/java/com/fishercoder/firstthousand/_773Test.java
index b0a21022ee..6d437d1f58 100644
--- a/src/test/java/com/fishercoder/firstthousand/_773Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_773Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _773Test {
-    private static _773.Solution1 solution1;
+    private _773.Solution1 solution1;
     private static int[][] board;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_775Test.java b/src/test/java/com/fishercoder/firstthousand/_775Test.java
index 89cebc847c..f46b4ede06 100644
--- a/src/test/java/com/fishercoder/firstthousand/_775Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_775Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._775;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _775Test {
-    private static _775.Solution1 solution1;
+    private _775.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _775.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_776Test.java b/src/test/java/com/fishercoder/firstthousand/_776Test.java
index e3dd8e040f..aababc60e4 100644
--- a/src/test/java/com/fishercoder/firstthousand/_776Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_776Test.java
@@ -4,20 +4,20 @@
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._776;
 import java.util.Arrays;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _776Test {
-  private static _776.Solution1 solution1;
-  private static _776.Solution2 solution2;
+  private _776.Solution1 solution1;
+  private _776.Solution2 solution2;
   private static TreeNode root;
   private static TreeNode small;
   private static TreeNode big;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _776.Solution1();
     solution2 = new _776.Solution2();
   }
diff --git a/src/test/java/com/fishercoder/firstthousand/_777Test.java b/src/test/java/com/fishercoder/firstthousand/_777Test.java
index 95f31ca273..e17cd1e338 100644
--- a/src/test/java/com/fishercoder/firstthousand/_777Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_777Test.java
@@ -9,7 +9,7 @@
 
 public class _777Test {
 
-    private static _777.Solution1 solution1;
+    private _777.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_779Test.java b/src/test/java/com/fishercoder/firstthousand/_779Test.java
index 7585ee43ee..7421d1152d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_779Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_779Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._779;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _779Test {
-  private static _779.Solution1 solution1;
-  private static _779.Solution2 solution2;
+  private _779.Solution1 solution1;
+  private _779.Solution2 solution2;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _779.Solution1();
     solution2 = new _779.Solution2();
   }
diff --git a/src/test/java/com/fishercoder/firstthousand/_77Test.java b/src/test/java/com/fishercoder/firstthousand/_77Test.java
index 047b97af93..e88a3ff975 100644
--- a/src/test/java/com/fishercoder/firstthousand/_77Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_77Test.java
@@ -6,8 +6,8 @@
 import org.junit.jupiter.api.Test;
 
 public class _77Test {
-    private static _77.Solution1 solution1;
-    private static _77.Solution2 solution2;
+    private _77.Solution1 solution1;
+    private _77.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_781Test.java b/src/test/java/com/fishercoder/firstthousand/_781Test.java
index 4e9d1d85b3..56eb130b9b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_781Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_781Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._781;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _781Test {
-    private static _781.Solution1 solution1;
+    private _781.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _781.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_783Test.java b/src/test/java/com/fishercoder/firstthousand/_783Test.java
index 8c16a5f50a..fabe1d89ff 100644
--- a/src/test/java/com/fishercoder/firstthousand/_783Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_783Test.java
@@ -4,17 +4,17 @@
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._783;
 import java.util.Arrays;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _783Test {
-  private static _783.Solution1 solution1;
+  private _783.Solution1 solution1;
   private static TreeNode root;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _783.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_784Test.java b/src/test/java/com/fishercoder/firstthousand/_784Test.java
index fdac0d9211..e6bedf9ef0 100644
--- a/src/test/java/com/fishercoder/firstthousand/_784Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_784Test.java
@@ -5,18 +5,18 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class _784Test {
-    private static _784.Solution1 solution1;
-    private static _784.Solution2 solution2;
+    private _784.Solution1 solution1;
+    private _784.Solution2 solution2;
     private static List<String> expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _784.Solution1();
         solution2 = new _784.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_785Test.java b/src/test/java/com/fishercoder/firstthousand/_785Test.java
index a1409841a9..9d6192622f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_785Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_785Test.java
@@ -2,19 +2,19 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._785;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class _785Test {
-    private static _785.Solution1 solution1;
-    private static _785.Solution2 solution2;
+    private _785.Solution1 solution1;
+    private _785.Solution2 solution2;
     private static int[][] graph;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _785.Solution1();
         solution2 = new _785.Solution2();
         graph = new int[][]{};
diff --git a/src/test/java/com/fishercoder/firstthousand/_788Test.java b/src/test/java/com/fishercoder/firstthousand/_788Test.java
index 1a7fa80f4a..6da99ce534 100644
--- a/src/test/java/com/fishercoder/firstthousand/_788Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_788Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._788;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _788Test {
-    private static _788.Solution1 solution1;
-    private static _788.Solution2 solution2;
+    private _788.Solution1 solution1;
+    private _788.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _788.Solution1();
         solution2 = new _788.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_789Test.java b/src/test/java/com/fishercoder/firstthousand/_789Test.java
index 4f1d694be9..5cf3bad187 100644
--- a/src/test/java/com/fishercoder/firstthousand/_789Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_789Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._789;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by varunu28 on 1/01/19.
  */
 
 public class _789Test {
-    private static _789.Solution test;
+    private _789.Solution test;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         test = new _789.Solution();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_78Test.java b/src/test/java/com/fishercoder/firstthousand/_78Test.java
index ab63d8d1a7..841068aacd 100644
--- a/src/test/java/com/fishercoder/firstthousand/_78Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_78Test.java
@@ -6,9 +6,9 @@
 import org.junit.jupiter.api.Test;
 
 public class _78Test {
-    private static _78.Solution1 solution1;
-    private static _78.Solution2 solution2;
-    private static _78.Solution3 solution3;
+    private _78.Solution1 solution1;
+    private _78.Solution2 solution2;
+    private _78.Solution3 solution3;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_791Test.java b/src/test/java/com/fishercoder/firstthousand/_791Test.java
index 6a99386f3a..ff345017d0 100644
--- a/src/test/java/com/fishercoder/firstthousand/_791Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_791Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _791Test {
-    private static _791.Solution1 solution1;
+    private _791.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_792Test.java b/src/test/java/com/fishercoder/firstthousand/_792Test.java
index 1c8d4ce3aa..dabb8ebb65 100644
--- a/src/test/java/com/fishercoder/firstthousand/_792Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_792Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._792;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _792Test {
-    private static _792.Solution1 solution1;
+    private _792.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _792.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_796Test.java b/src/test/java/com/fishercoder/firstthousand/_796Test.java
index 835f7c2562..482010a4e7 100644
--- a/src/test/java/com/fishercoder/firstthousand/_796Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_796Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._796;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _796Test {
-  private static _796.Solution1 solution1;
+  private _796.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _796.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_799Test.java b/src/test/java/com/fishercoder/firstthousand/_799Test.java
index f60b4345e1..cbbb95bc02 100644
--- a/src/test/java/com/fishercoder/firstthousand/_799Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_799Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._799;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _799Test {
-  private static _799.Solution1 solution1;
+  private _799.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _799.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_79Test.java b/src/test/java/com/fishercoder/firstthousand/_79Test.java
index aa12a493e5..07953c4245 100644
--- a/src/test/java/com/fishercoder/firstthousand/_79Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_79Test.java
@@ -8,9 +8,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _79Test {
-    private static _79.Solution1 solution1;
-    private static _79.Solution2 solution2;
-    private static _79.Solution3 solution3;
+    private _79.Solution1 solution1;
+    private _79.Solution2 solution2;
+    private _79.Solution3 solution3;
     private static char[][] board;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_7Test.java b/src/test/java/com/fishercoder/firstthousand/_7Test.java
index 74e04f7ac3..76d57b8586 100644
--- a/src/test/java/com/fishercoder/firstthousand/_7Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_7Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _7Test {
-    private static _7.Solution1 solution1;
-    private static _7.Solution2 solution2;
+    private _7.Solution1 solution1;
+    private _7.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_800Test.java b/src/test/java/com/fishercoder/firstthousand/_800Test.java
index 1118bd0e8b..6a57c85aef 100644
--- a/src/test/java/com/fishercoder/firstthousand/_800Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_800Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._800;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _800Test {
-  private static _800.Solution1 solution1;
+  private _800.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _800.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_802Test.java b/src/test/java/com/fishercoder/firstthousand/_802Test.java
index 5966d6941c..8c76a7203f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_802Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_802Test.java
@@ -9,7 +9,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _802Test {
-    private static _802.Solution1 solution1;
+    private _802.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_804Test.java b/src/test/java/com/fishercoder/firstthousand/_804Test.java
index dcefa454fa..4d5f08f613 100644
--- a/src/test/java/com/fishercoder/firstthousand/_804Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_804Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._804;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _804Test {
-  private static _804.Solution1 solution1;
+  private _804.Solution1 solution1;
   private static String[] words;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _804.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_806Test.java b/src/test/java/com/fishercoder/firstthousand/_806Test.java
index 956e3f77d2..8c918d589c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_806Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_806Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._806;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _806Test {
-  private static _806.Solution1 solution1;
+  private _806.Solution1 solution1;
   private static int[] widths;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _806.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_807Test.java b/src/test/java/com/fishercoder/firstthousand/_807Test.java
index 50a8da4b68..98c6ef5b82 100644
--- a/src/test/java/com/fishercoder/firstthousand/_807Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_807Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._807;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _807Test {
-    private static _807.Solution1 solution1;
+    private _807.Solution1 solution1;
     private static int[][] grid;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _807.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_809Test.java b/src/test/java/com/fishercoder/firstthousand/_809Test.java
index 28a9eeb7f5..9fe0f80a3b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_809Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_809Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._809;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _809Test {
-    private static _809.Solution1 solution1;
+    private _809.Solution1 solution1;
     private String[] words;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _809.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_80Test.java b/src/test/java/com/fishercoder/firstthousand/_80Test.java
index a4fd0c9906..9377194312 100644
--- a/src/test/java/com/fishercoder/firstthousand/_80Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_80Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _80Test {
-    private static _80.Solution1 solution1;
+    private _80.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_811Test.java b/src/test/java/com/fishercoder/firstthousand/_811Test.java
index 710f6dac51..3143cd5b8f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_811Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_811Test.java
@@ -2,15 +2,15 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._811;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _811Test {
-  private static _811.Solution1 solution1;
+  private _811.Solution1 solution1;
   private static String[] cpdomains;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _811.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_812Test.java b/src/test/java/com/fishercoder/firstthousand/_812Test.java
index 05406486c5..1a44b97d77 100644
--- a/src/test/java/com/fishercoder/firstthousand/_812Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_812Test.java
@@ -2,16 +2,16 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._812;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _812Test {
-    private static _812.Solution1 solution1;
+    private _812.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _812.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_814Test.java b/src/test/java/com/fishercoder/firstthousand/_814Test.java
index 576d818411..eece7e9a61 100644
--- a/src/test/java/com/fishercoder/firstthousand/_814Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_814Test.java
@@ -3,16 +3,16 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._814;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
 public class _814Test {
-    private static _814.Solution1 solution1;
+    private _814.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _814.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_819Test.java b/src/test/java/com/fishercoder/firstthousand/_819Test.java
index 2f24d110b6..5c1b80ab70 100644
--- a/src/test/java/com/fishercoder/firstthousand/_819Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_819Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._819;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _819Test {
-  private static _819.Solution1 solution1;
+  private _819.Solution1 solution1;
   private static String[] banned;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _819.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_81Test.java b/src/test/java/com/fishercoder/firstthousand/_81Test.java
index db49c506ef..c19f819180 100644
--- a/src/test/java/com/fishercoder/firstthousand/_81Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_81Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _81Test {
-    private static _81.Solution1 solution1;
+    private _81.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_821Test.java b/src/test/java/com/fishercoder/firstthousand/_821Test.java
index 4dcfe28c14..ec29e209ed 100644
--- a/src/test/java/com/fishercoder/firstthousand/_821Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_821Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _821Test {
-    private static _821.Solution1 solution1;
-    private static _821.Solution2 solution2;
+    private _821.Solution1 solution1;
+    private _821.Solution2 solution2;
     private static int[] expected;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_823Test.java b/src/test/java/com/fishercoder/firstthousand/_823Test.java
index 82d6af1968..2c360f5d08 100644
--- a/src/test/java/com/fishercoder/firstthousand/_823Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_823Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _823Test {
-    private static _823.Solution1 solution1;
+    private _823.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_824Test.java b/src/test/java/com/fishercoder/firstthousand/_824Test.java
index f0c760a695..9323f42733 100644
--- a/src/test/java/com/fishercoder/firstthousand/_824Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_824Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._824;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _824Test {
-  private static _824.Solution1 solution1;
+  private _824.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _824.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_826Test.java b/src/test/java/com/fishercoder/firstthousand/_826Test.java
index 9fcc786aa9..d16e36c690 100644
--- a/src/test/java/com/fishercoder/firstthousand/_826Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_826Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _826Test {
-    private static _826.Solution1 solution1;
+    private _826.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_82Test.java b/src/test/java/com/fishercoder/firstthousand/_82Test.java
index 2eb95acce6..ac3d6fc4af 100644
--- a/src/test/java/com/fishercoder/firstthousand/_82Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_82Test.java
@@ -10,7 +10,7 @@
 
 public class _82Test {
 
-    private static _82.Solution1 solution1;
+    private _82.Solution1 solution1;
     private static ListNode head;
     private static ListNode expected;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_830Test.java b/src/test/java/com/fishercoder/firstthousand/_830Test.java
index 2f37ad50b9..2c00e48817 100644
--- a/src/test/java/com/fishercoder/firstthousand/_830Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_830Test.java
@@ -4,17 +4,17 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _830Test {
-  private static _830.Solution1 solution1;
+  private _830.Solution1 solution1;
   private static List<List<Integer>> expected;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _830.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_832Test.java b/src/test/java/com/fishercoder/firstthousand/_832Test.java
index f2861e9650..9ae23e9ffa 100644
--- a/src/test/java/com/fishercoder/firstthousand/_832Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_832Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._832;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _832Test {
-  private static _832.Solution1 solution1;
+  private _832.Solution1 solution1;
   private static int[][] expected;
   private static int[][] A;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _832.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_836Test.java b/src/test/java/com/fishercoder/firstthousand/_836Test.java
index 39d6436f98..67b3315fcb 100644
--- a/src/test/java/com/fishercoder/firstthousand/_836Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_836Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._836;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _836Test {
-    private static _836.Solution1 solution1;
+    private _836.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _836.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_838Test.java b/src/test/java/com/fishercoder/firstthousand/_838Test.java
index 2d664abaf6..9e0066c1c6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_838Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_838Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._838;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _838Test {
-    private static _838.Solution1 solution1;
+    private _838.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _838.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_83Test.java b/src/test/java/com/fishercoder/firstthousand/_83Test.java
index a1782e94ee..13a58f24a7 100644
--- a/src/test/java/com/fishercoder/firstthousand/_83Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_83Test.java
@@ -15,8 +15,8 @@
  */
 public class _83Test {
 
-    private static _83.Solution1 solution1;
-    private static _83.Solution2 solution2;
+    private _83.Solution1 solution1;
+    private _83.Solution2 solution2;
     private static ListNode head;
     private static ListNode expected;
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_840Test.java b/src/test/java/com/fishercoder/firstthousand/_840Test.java
index ebecafad46..2246149221 100644
--- a/src/test/java/com/fishercoder/firstthousand/_840Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_840Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _840Test {
-    private static _840.Solution1 test;
+    private _840.Solution1 test;
     private static int[][] grid;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_841Test.java b/src/test/java/com/fishercoder/firstthousand/_841Test.java
index a03750b1b5..e4b42ec9ef 100644
--- a/src/test/java/com/fishercoder/firstthousand/_841Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_841Test.java
@@ -1,23 +1,23 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._841;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _841Test {
-    private static _841.Solution1 solution1;
-    private static _841.Solution2 solution2;
-    private static _841.Solution3 solution3;
+    private _841.Solution1 solution1;
+    private _841.Solution2 solution2;
+    private _841.Solution3 solution3;
     private static List<List<Integer>> rooms;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _841.Solution1();
         solution2 = new _841.Solution2();
         solution3 = new _841.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_844Test.java b/src/test/java/com/fishercoder/firstthousand/_844Test.java
index 2859763573..a3f7ff54fb 100644
--- a/src/test/java/com/fishercoder/firstthousand/_844Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_844Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _844Test {
-    private static _844.Solution1 solution1;
+    private _844.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_848Test.java b/src/test/java/com/fishercoder/firstthousand/_848Test.java
index e40f1f5bad..8c331d90e4 100644
--- a/src/test/java/com/fishercoder/firstthousand/_848Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_848Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._848;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _848Test {
-    private static _848.Solution1 solution1;
+    private _848.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _848.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_849Test.java b/src/test/java/com/fishercoder/firstthousand/_849Test.java
index e0cda5e93d..1257553704 100644
--- a/src/test/java/com/fishercoder/firstthousand/_849Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_849Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._849;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _849Test {
 
-    private static _849.Solution1 solution1;
-    private static _849.Solution2 solution2;
+    private _849.Solution1 solution1;
+    private _849.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _849.Solution1();
         solution2 = new _849.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_84Test.java b/src/test/java/com/fishercoder/firstthousand/_84Test.java
index 87989529fd..a83702d1b0 100644
--- a/src/test/java/com/fishercoder/firstthousand/_84Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_84Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _84Test {
-    private static _84.Solution1 solution1;
+    private _84.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_851Test.java b/src/test/java/com/fishercoder/firstthousand/_851Test.java
index 2252669f7d..8e5e58945e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_851Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_851Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _851Test {
-    private static _851.Solution1 solution1;
+    private _851.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_852Test.java b/src/test/java/com/fishercoder/firstthousand/_852Test.java
index ad01b26cc6..eb31cf144e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_852Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_852Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._852;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _852Test {
-    private static _852.Solution1 solution1;
+    private _852.Solution1 solution1;
     private static int[] A;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _852.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_856Test.java b/src/test/java/com/fishercoder/firstthousand/_856Test.java
index e1526ea03f..e204cecd99 100644
--- a/src/test/java/com/fishercoder/firstthousand/_856Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_856Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._856;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _856Test {
-    private static _856.Solution1 solution1;
+    private _856.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _856.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_859Test.java b/src/test/java/com/fishercoder/firstthousand/_859Test.java
index 2a891e38c9..1426125117 100644
--- a/src/test/java/com/fishercoder/firstthousand/_859Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_859Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._859;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _859Test {
-  private static _859.Solution1 solution1;
+  private _859.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _859.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_85Test.java b/src/test/java/com/fishercoder/firstthousand/_85Test.java
index cabf9952d5..d65e3cffd3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_85Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_85Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _85Test {
-    private static _85.Solution1 solution1;
+    private _85.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_860Test.java b/src/test/java/com/fishercoder/firstthousand/_860Test.java
index 315504551e..9f61fd78ad 100644
--- a/src/test/java/com/fishercoder/firstthousand/_860Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_860Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._860;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _860Test {
 
-  private static _860.Solution1 test;
+  private _860.Solution1 test;
   private static int[] bills;
 
-  @BeforeClass
-  public static void setUp() {
+  @BeforeEach
+    public void setUp() {
     test = new _860.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_861Test.java b/src/test/java/com/fishercoder/firstthousand/_861Test.java
index 3f730560d5..abe5014979 100644
--- a/src/test/java/com/fishercoder/firstthousand/_861Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_861Test.java
@@ -2,16 +2,16 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._861;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _861Test {
-    private static _861.Solution1 solution1;
+    private _861.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _861.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_867Test.java b/src/test/java/com/fishercoder/firstthousand/_867Test.java
index 8b0bb9c8c5..92ba933027 100644
--- a/src/test/java/com/fishercoder/firstthousand/_867Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_867Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._867;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _867Test {
-    private static _867.Solution1 solution1;
+    private _867.Solution1 solution1;
     private static int[][] A;
     private static int[][] result;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _867.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_868Test.java b/src/test/java/com/fishercoder/firstthousand/_868Test.java
index 40154a806a..d02dc7b67f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_868Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_868Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._868;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _868Test {
-  private static _868.Solution1 solution1;
+  private _868.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _868.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_86Test.java b/src/test/java/com/fishercoder/firstthousand/_86Test.java
index 27d6f24ae6..802f6fbd9c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_86Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_86Test.java
@@ -3,21 +3,21 @@
 import com.fishercoder.common.classes.ListNode;
 import com.fishercoder.common.utils.LinkedListUtils;
 import com.fishercoder.solutions.firstthousand._86;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _86Test {
-    private static _86.Solution1 solution1;
-    private static _86.Solution2 solution2;
+    private _86.Solution1 solution1;
+    private _86.Solution2 solution2;
     private static ListNode head;
     private static ListNode expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _86.Solution1();
         solution2 = new _86.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_870Test.java b/src/test/java/com/fishercoder/firstthousand/_870Test.java
index 2dedcf36a1..e320537bc6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_870Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_870Test.java
@@ -2,16 +2,16 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._870;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _870Test {
-    private static _870.Solution1 solution1;
+    private _870.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _870.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_872Test.java b/src/test/java/com/fishercoder/firstthousand/_872Test.java
index 3b032b5c64..275e49f06b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_872Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_872Test.java
@@ -4,18 +4,18 @@
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._872;
 import java.util.Arrays;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _872Test {
-  private static _872.Solution1 solution1;
+  private _872.Solution1 solution1;
   private static TreeNode root1;
   private static TreeNode root2;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _872.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_875Test.java b/src/test/java/com/fishercoder/firstthousand/_875Test.java
index dd857078b3..c89e21bd8d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_875Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_875Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _875Test {
-    private static _875.Solution1 solution1;
+    private _875.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_876Test.java b/src/test/java/com/fishercoder/firstthousand/_876Test.java
index b345dd734c..ca6a4d2ddf 100644
--- a/src/test/java/com/fishercoder/firstthousand/_876Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_876Test.java
@@ -6,18 +6,18 @@
 
 import java.util.Arrays;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _876Test {
-    private static _876.Solution1 solution1;
+    private _876.Solution1 solution1;
     private static ListNode head;
     private static ListNode middle;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _876.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_877Test.java b/src/test/java/com/fishercoder/firstthousand/_877Test.java
index 3916f46205..d7ce01802d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_877Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_877Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._877;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _877Test {
-    private static _877.Solution1 solution1;
+    private _877.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _877.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_87Test.java b/src/test/java/com/fishercoder/firstthousand/_87Test.java
index e5bac5a84b..4a1149717d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_87Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_87Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._87;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _87Test {
-  private static _87.Solution1 solution1;
+  private _87.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _87.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_880Test.java b/src/test/java/com/fishercoder/firstthousand/_880Test.java
index e2c8922509..45e7e8dc60 100644
--- a/src/test/java/com/fishercoder/firstthousand/_880Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_880Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._880;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@Ignore
+@Disabled
 public class _880Test {
-    private static _880.Solution1 solution1;
+    private _880.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _880.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_881Test.java b/src/test/java/com/fishercoder/firstthousand/_881Test.java
index 835e2516bb..5068debafc 100644
--- a/src/test/java/com/fishercoder/firstthousand/_881Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_881Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._881;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _881Test {
-    private static _881.Solution1 solution1;
+    private _881.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _881.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_883Test.java b/src/test/java/com/fishercoder/firstthousand/_883Test.java
index cc850209e0..0929c030c3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_883Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_883Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._883;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _883Test {
-    private static _883.Solution1 solution1;
+    private _883.Solution1 solution1;
     private static int[][] grid;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _883.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_884Test.java b/src/test/java/com/fishercoder/firstthousand/_884Test.java
index 2b29315b20..25683fe581 100644
--- a/src/test/java/com/fishercoder/firstthousand/_884Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_884Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._884;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _884Test {
-  private static _884.Solution1 solution1;
+  private _884.Solution1 solution1;
   private static String[] expected;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _884.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_885Test.java b/src/test/java/com/fishercoder/firstthousand/_885Test.java
index 442721cbf8..d478d282bc 100644
--- a/src/test/java/com/fishercoder/firstthousand/_885Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_885Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _885Test {
-    private static _885.Solution1 solution1;
+    private _885.Solution1 solution1;
     private static int[][] expected;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_888Test.java b/src/test/java/com/fishercoder/firstthousand/_888Test.java
index babffa9008..552507c9d6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_888Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_888Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._888;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _888Test {
-    private static _888.Solution1 solution1;
+    private _888.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _888.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_88Test.java b/src/test/java/com/fishercoder/firstthousand/_88Test.java
index bc18528c1b..36613e7e95 100644
--- a/src/test/java/com/fishercoder/firstthousand/_88Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_88Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._88;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _88Test {
 
-  private static _88.Solution1 solution1;
+  private _88.Solution1 solution1;
   private int[] nums1;
   private int[] nums2;
   private int[] expected;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _88.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_890Test.java b/src/test/java/com/fishercoder/firstthousand/_890Test.java
index cdf2262cb6..a346cfa369 100644
--- a/src/test/java/com/fishercoder/firstthousand/_890Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_890Test.java
@@ -2,16 +2,16 @@
 
 import com.fishercoder.solutions.firstthousand._890;
 import java.util.Arrays;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _890Test {
-  private static _890.Solution1 solution1;
+  private _890.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _890.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_892Test.java b/src/test/java/com/fishercoder/firstthousand/_892Test.java
index 74bd819a1c..918707e4d1 100644
--- a/src/test/java/com/fishercoder/firstthousand/_892Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_892Test.java
@@ -2,16 +2,16 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._892;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _892Test {
-    private static _892.Solution1 solution1;
+    private _892.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _892.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_893Test.java b/src/test/java/com/fishercoder/firstthousand/_893Test.java
index 91fdf4fee3..18ecb1fac6 100644
--- a/src/test/java/com/fishercoder/firstthousand/_893Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_893Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._893;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _893Test {
-    private static _893.Solution1 solution1;
-    private static _893.Solution2 solution2;
+    private _893.Solution1 solution1;
+    private _893.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _893.Solution1();
         solution2 = new _893.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_895Test.java b/src/test/java/com/fishercoder/firstthousand/_895Test.java
index 57a3f70fa3..d84de88f4a 100644
--- a/src/test/java/com/fishercoder/firstthousand/_895Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_895Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._895;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _895Test {
 
-    private static _895.Solution1.FreqStack freqStack;
+    private _895.Solution1.FreqStack freqStack;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         freqStack = new _895.Solution1.FreqStack();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_896Test.java b/src/test/java/com/fishercoder/firstthousand/_896Test.java
index 64ed98466c..faca515742 100644
--- a/src/test/java/com/fishercoder/firstthousand/_896Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_896Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _896Test {
-    private static _896.Solution1 solution1;
+    private _896.Solution1 solution1;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_897Test.java b/src/test/java/com/fishercoder/firstthousand/_897Test.java
index 7df585e665..02f321f1f3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_897Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_897Test.java
@@ -4,16 +4,16 @@
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._897;
 import java.util.Arrays;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _897Test {
-  private static _897.Solution1 solution1;
+  private _897.Solution1 solution1;
   private static TreeNode root;
   private static TreeNode actual;
 
-  @Before
-  public void setup() {
+  @BeforeEach
+    public void setup() {
     solution1 = new _897.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_89Test.java b/src/test/java/com/fishercoder/firstthousand/_89Test.java
index b139457605..d7428c1d00 100644
--- a/src/test/java/com/fishercoder/firstthousand/_89Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_89Test.java
@@ -2,18 +2,18 @@
 
 import com.fishercoder.solutions.firstthousand._89;
 import java.util.Arrays;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _89Test {
 
-  private static _89.Solution1 solution1;
-  private static _89.Solution2 solution2;
+  private _89.Solution1 solution1;
+  private _89.Solution2 solution2;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _89.Solution1();
     solution2 = new _89.Solution2();
   }
diff --git a/src/test/java/com/fishercoder/firstthousand/_8Test.java b/src/test/java/com/fishercoder/firstthousand/_8Test.java
index 88d164f0c3..392d6e4951 100644
--- a/src/test/java/com/fishercoder/firstthousand/_8Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_8Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _8Test {
-    private static _8.Solution1 solution1;
+    private _8.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_900Test.java b/src/test/java/com/fishercoder/firstthousand/_900Test.java
index 42ccddb7a2..9688dc3f09 100644
--- a/src/test/java/com/fishercoder/firstthousand/_900Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_900Test.java
@@ -1,12 +1,12 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._900;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _900Test {
-  private static _900.Solution1.RLEIterator rleIterator;
+  private _900.Solution1.RLEIterator rleIterator;
 
   @Test
   public void test1() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_901Test.java b/src/test/java/com/fishercoder/firstthousand/_901Test.java
index 2c4d10d9e4..6149d3b506 100644
--- a/src/test/java/com/fishercoder/firstthousand/_901Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_901Test.java
@@ -1,12 +1,12 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._901;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _901Test {
-    private static _901.Solution1.StockSpanner stockSpanner;
+    private _901.Solution1.StockSpanner stockSpanner;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_904Test.java b/src/test/java/com/fishercoder/firstthousand/_904Test.java
index c60b8f9a91..098a6a15e7 100644
--- a/src/test/java/com/fishercoder/firstthousand/_904Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_904Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _904Test {
-    private static _904.Solution1 solution1;
+    private _904.Solution1 solution1;
     private static int[] fruits;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_905Test.java b/src/test/java/com/fishercoder/firstthousand/_905Test.java
index 242bee3db1..eac28df1a1 100644
--- a/src/test/java/com/fishercoder/firstthousand/_905Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_905Test.java
@@ -2,16 +2,16 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._905;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _905Test {
-    private static _905.Solution1 solution1;
+    private _905.Solution1 solution1;
     private static int[] A;
     private static int[] actual;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _905.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_908Test.java b/src/test/java/com/fishercoder/firstthousand/_908Test.java
index 64d983a552..447673c721 100644
--- a/src/test/java/com/fishercoder/firstthousand/_908Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_908Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._908;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _908Test {
-  private static _908.Solution1 solution1;
-  private static _908.Solution2 solution2;
+  private _908.Solution1 solution1;
+  private _908.Solution2 solution2;
   private static int[] A;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _908.Solution1();
     solution2 = new _908.Solution2();
   }
diff --git a/src/test/java/com/fishercoder/firstthousand/_90Test.java b/src/test/java/com/fishercoder/firstthousand/_90Test.java
index d323c3f6c5..41dc75d4c5 100644
--- a/src/test/java/com/fishercoder/firstthousand/_90Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_90Test.java
@@ -2,16 +2,16 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._90;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _90Test {
-    private static _90.Solution1 solution1;
-    private static _90.Solution2 solution2;
-    private static _90.Solution3 solution3;
+    private _90.Solution1 solution1;
+    private _90.Solution2 solution2;
+    private _90.Solution3 solution3;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _90.Solution1();
         solution2 = new _90.Solution2();
         solution3 = new _90.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_914Test.java b/src/test/java/com/fishercoder/firstthousand/_914Test.java
index 3d21b2489b..4f97d8fb1f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_914Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_914Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._914;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _914Test {
-    private static _914.Solution1 solution1;
+    private _914.Solution1 solution1;
     private int[] arr;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _914.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_917Test.java b/src/test/java/com/fishercoder/firstthousand/_917Test.java
index 0cfe8de006..39aff28980 100644
--- a/src/test/java/com/fishercoder/firstthousand/_917Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_917Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._917;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _917Test {
-    private static _917.Solution1 solution1;
+    private _917.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _917.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_918Test.java b/src/test/java/com/fishercoder/firstthousand/_918Test.java
index 7a38a5bd45..f03912ec6d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_918Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_918Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._918;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _918Test {
-    private static _918.Solution1 solution1;
-    private static _918.Solution2 solution2;
-    private static _918.Solution3 solution3;
+    private _918.Solution1 solution1;
+    private _918.Solution2 solution2;
+    private _918.Solution3 solution3;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _918.Solution1();
         solution2 = new _918.Solution2();
         solution3 = new _918.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_919Test.java b/src/test/java/com/fishercoder/firstthousand/_919Test.java
index 1ecc0e5305..4a6363cdfa 100644
--- a/src/test/java/com/fishercoder/firstthousand/_919Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_919Test.java
@@ -11,7 +11,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _919Test {
-    private static _919.Solution1.CBTInserter cbtInserter;
+    private _919.Solution1.CBTInserter cbtInserter;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_91Test.java b/src/test/java/com/fishercoder/firstthousand/_91Test.java
index 4f9d8e6156..3afb598eae 100644
--- a/src/test/java/com/fishercoder/firstthousand/_91Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_91Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._91;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _91Test {
-    private static _91.Solution1 solution1;
-    private static _91.Solution2 solution2;
+    private _91.Solution1 solution1;
+    private _91.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _91.Solution1();
         solution2 = new _91.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_921Test.java b/src/test/java/com/fishercoder/firstthousand/_921Test.java
index 310fe6e879..9c505947d7 100644
--- a/src/test/java/com/fishercoder/firstthousand/_921Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_921Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _921Test {
-    private static _921.Solution1 solution1;
+    private _921.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_922Test.java b/src/test/java/com/fishercoder/firstthousand/_922Test.java
index 8d472b1203..16dfc858a8 100644
--- a/src/test/java/com/fishercoder/firstthousand/_922Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_922Test.java
@@ -2,18 +2,18 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._922;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _922Test {
-    private static _922.Solution1 solution1;
-    private static _922.Solution2 solution2;
-    private static _922.Solution3 solution3;
+    private _922.Solution1 solution1;
+    private _922.Solution2 solution2;
+    private _922.Solution3 solution3;
     private static int[] nums;
     private static int[] result;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _922.Solution1();
         solution2 = new _922.Solution2();
         solution3 = new _922.Solution3();
diff --git a/src/test/java/com/fishercoder/firstthousand/_923Test.java b/src/test/java/com/fishercoder/firstthousand/_923Test.java
index 3655b58509..644f6d7894 100644
--- a/src/test/java/com/fishercoder/firstthousand/_923Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_923Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._923;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _923Test {
-    private static _923.Solution1 solution1;
+    private _923.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _923.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_925Test.java b/src/test/java/com/fishercoder/firstthousand/_925Test.java
index daa1bed3e8..ddc89f7e93 100644
--- a/src/test/java/com/fishercoder/firstthousand/_925Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_925Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._925;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _925Test {
-    private static _925.Solution1 solution1;
+    private _925.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _925.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_929Test.java b/src/test/java/com/fishercoder/firstthousand/_929Test.java
index e64ed4b4b6..3e65a8a2a4 100644
--- a/src/test/java/com/fishercoder/firstthousand/_929Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_929Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._929;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _929Test {
-    private static _929.Solution1 solution1;
+    private _929.Solution1 solution1;
     private static String[] emails;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _929.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_92Test.java b/src/test/java/com/fishercoder/firstthousand/_92Test.java
index fc08437f0f..1db0f98260 100644
--- a/src/test/java/com/fishercoder/firstthousand/_92Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_92Test.java
@@ -3,21 +3,21 @@
 import com.fishercoder.common.classes.ListNode;
 import com.fishercoder.common.utils.LinkedListUtils;
 import com.fishercoder.solutions.firstthousand._92;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _92Test {
-    private static _92.Solution1 solution1;
-    private static _92.Solution2 solution2;
+    private _92.Solution1 solution1;
+    private _92.Solution2 solution2;
     private static ListNode head;
     private static ListNode expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _92.Solution1();
         solution2 = new _92.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_931Test.java b/src/test/java/com/fishercoder/firstthousand/_931Test.java
index dc9982189f..d2f4b93634 100644
--- a/src/test/java/com/fishercoder/firstthousand/_931Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_931Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._931;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _931Test {
-    private static _931.Solution1 solution1;
+    private _931.Solution1 solution1;
     private static int[][] A;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _931.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_933Test.java b/src/test/java/com/fishercoder/firstthousand/_933Test.java
index d63a61daf4..6b734b9efa 100644
--- a/src/test/java/com/fishercoder/firstthousand/_933Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_933Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._933;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _933Test {
-    private static _933.Solution1.RecentCounter solution1;
+    private _933.Solution1.RecentCounter solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _933.Solution1.RecentCounter();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_934Test.java b/src/test/java/com/fishercoder/firstthousand/_934Test.java
index 1dec93ce29..63256ecc33 100644
--- a/src/test/java/com/fishercoder/firstthousand/_934Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_934Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _934Test {
-    private static _934.Solution1 solution1;
+    private _934.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_935Test.java b/src/test/java/com/fishercoder/firstthousand/_935Test.java
index ce9c637022..c472e97e8c 100644
--- a/src/test/java/com/fishercoder/firstthousand/_935Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_935Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._935;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _935Test {
-    private static _935.Solution1 solution1;
+    private _935.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _935.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_936Test.java b/src/test/java/com/fishercoder/firstthousand/_936Test.java
index af1897b496..1eb48629af 100644
--- a/src/test/java/com/fishercoder/firstthousand/_936Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_936Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._936;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _936Test {
-    private static _936.Solution1 solution1;
+    private _936.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _936.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_937Test.java b/src/test/java/com/fishercoder/firstthousand/_937Test.java
index 0d799761a3..ba96df18ad 100644
--- a/src/test/java/com/fishercoder/firstthousand/_937Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_937Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._937;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _937Test {
-  private static _937.Solution1 solution1;
+  private _937.Solution1 solution1;
   private static String[] logs;
   private static String[] expected;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _937.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_938Test.java b/src/test/java/com/fishercoder/firstthousand/_938Test.java
index bc2fa3b511..6c4d26cdc8 100644
--- a/src/test/java/com/fishercoder/firstthousand/_938Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_938Test.java
@@ -4,17 +4,17 @@
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._938;
 import java.util.Arrays;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _938Test {
-  private static _938.Solution1 solution1;
+  private _938.Solution1 solution1;
   private static TreeNode root;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _938.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_93Test.java b/src/test/java/com/fishercoder/firstthousand/_93Test.java
index 990a0ea672..0af983302b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_93Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_93Test.java
@@ -1,27 +1,27 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._93;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _93Test {
-  private static _93.Solution1 solution1;
+  private _93.Solution1 solution1;
   private static List<String> expected;
   private static String s;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _93.Solution1();
   }
 
-  @Before
-  public void setupForEachTest() {
+  @BeforeEach
+    public void setupForEachTest() {
     expected = new ArrayList<>();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_941Test.java b/src/test/java/com/fishercoder/firstthousand/_941Test.java
index 9c47884e0c..5d8785a30d 100644
--- a/src/test/java/com/fishercoder/firstthousand/_941Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_941Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._941;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _941Test {
-    private static _941.Solution1 solution1;
+    private _941.Solution1 solution1;
     private static int[] A;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _941.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_942Test.java b/src/test/java/com/fishercoder/firstthousand/_942Test.java
index 3ba8ab656c..a853c7bf09 100644
--- a/src/test/java/com/fishercoder/firstthousand/_942Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_942Test.java
@@ -2,14 +2,14 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._942;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _942Test {
-  private static _942.Solution1 solution1;
+  private _942.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _942.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_944Test.java b/src/test/java/com/fishercoder/firstthousand/_944Test.java
index b9d63aceff..229c1d9ece 100644
--- a/src/test/java/com/fishercoder/firstthousand/_944Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_944Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._944;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _944Test {
-  private static _944.Solution1 solution1;
+  private _944.Solution1 solution1;
   private static String[] A;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _944.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_945Test.java b/src/test/java/com/fishercoder/firstthousand/_945Test.java
index 5813db3153..2d40efd207 100644
--- a/src/test/java/com/fishercoder/firstthousand/_945Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_945Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _945Test {
-    private static _945.Solution1 solution1;
+    private _945.Solution1 solution1;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_946Test.java b/src/test/java/com/fishercoder/firstthousand/_946Test.java
index 40bf1f5d44..35cc503658 100644
--- a/src/test/java/com/fishercoder/firstthousand/_946Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_946Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._946;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _946Test {
 
-    private static _946.Solution1 solution1;
-    private static _946.Solution2 solution2;
+    private _946.Solution1 solution1;
+    private _946.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _946.Solution1();
         solution2 = new _946.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_94Test.java b/src/test/java/com/fishercoder/firstthousand/_94Test.java
index 5f773530b3..d096f06519 100644
--- a/src/test/java/com/fishercoder/firstthousand/_94Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_94Test.java
@@ -4,20 +4,20 @@
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._94;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
 public class _94Test {
-    private static _94.Solution1 solution1;
-    private static _94.Solution2 solution2;
+    private _94.Solution1 solution1;
+    private _94.Solution2 solution2;
     private static TreeNode root;
     private static List<Integer> inorder;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _94.Solution1();
         solution2 = new _94.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_950Test.java b/src/test/java/com/fishercoder/firstthousand/_950Test.java
index 9e8d47ccc4..24a1dd4481 100644
--- a/src/test/java/com/fishercoder/firstthousand/_950Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_950Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._950;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _950Test {
-  private static _950.Solution1 solution1;
+  private _950.Solution1 solution1;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _950.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_951Test.java b/src/test/java/com/fishercoder/firstthousand/_951Test.java
index 15e6b23de2..ae69397e23 100644
--- a/src/test/java/com/fishercoder/firstthousand/_951Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_951Test.java
@@ -3,19 +3,19 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._951;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class _951Test {
-    private static _951.Solution1 solution1;
+    private _951.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _951.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_953Test.java b/src/test/java/com/fishercoder/firstthousand/_953Test.java
index 3b4f595a0d..088d1da6a7 100644
--- a/src/test/java/com/fishercoder/firstthousand/_953Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_953Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._953;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _953Test {
-    private static _953.Solution1 solution1;
-    private static _953.Solution2 solution2;
+    private _953.Solution1 solution1;
+    private _953.Solution2 solution2;
     private static String[] words;
     private static String order;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _953.Solution1();
         solution2 = new _953.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_954Test.java b/src/test/java/com/fishercoder/firstthousand/_954Test.java
index 51e3c8ad06..aecb0ae201 100644
--- a/src/test/java/com/fishercoder/firstthousand/_954Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_954Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._954;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _954Test {
-    private static _954.Solution1 solution1;
+    private _954.Solution1 solution1;
     private static int[] A;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _954.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_957Test.java b/src/test/java/com/fishercoder/firstthousand/_957Test.java
index 62dbb6376d..e03f8f59bc 100644
--- a/src/test/java/com/fishercoder/firstthousand/_957Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_957Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._957;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _957Test {
-    private static _957.Solution1 solution1;
+    private _957.Solution1 solution1;
     private static int[] cells;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _957.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_958Test.java b/src/test/java/com/fishercoder/firstthousand/_958Test.java
index 3f7b28b3bc..72027d2b00 100644
--- a/src/test/java/com/fishercoder/firstthousand/_958Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_958Test.java
@@ -3,18 +3,18 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._958;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _958Test {
-    private static _958.Solution1 solution1;
+    private _958.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _958.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_95Test.java b/src/test/java/com/fishercoder/firstthousand/_95Test.java
index 658566cc58..1aa6f5c85b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_95Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_95Test.java
@@ -2,14 +2,14 @@
 
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._95;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _95Test {
-    private static _95.Solution1 solution1;
+    private _95.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _95.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_961Test.java b/src/test/java/com/fishercoder/firstthousand/_961Test.java
index 21dfa6ab07..267de4e284 100644
--- a/src/test/java/com/fishercoder/firstthousand/_961Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_961Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._961;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _961Test {
-    private static _961.Solution1 solution1;
+    private _961.Solution1 solution1;
     private static int[] A;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _961.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_965Test.java b/src/test/java/com/fishercoder/firstthousand/_965Test.java
index 7b052e0616..6af79399cf 100644
--- a/src/test/java/com/fishercoder/firstthousand/_965Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_965Test.java
@@ -5,17 +5,17 @@
 import com.fishercoder.solutions.firstthousand._965;
 import java.util.Arrays;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _965Test {
-  private static _965.Solution1 solution1;
+  private _965.Solution1 solution1;
   private static TreeNode root;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _965.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_966Test.java b/src/test/java/com/fishercoder/firstthousand/_966Test.java
index 4cec0cd39e..f75fb13029 100644
--- a/src/test/java/com/fishercoder/firstthousand/_966Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_966Test.java
@@ -1,12 +1,12 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._966;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by varunu28 on 1/01/19.
@@ -14,10 +14,10 @@
 
 
 public class _966Test {
-    private static _966.Solution1 solution1;
+    private _966.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _966.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_96Test.java b/src/test/java/com/fishercoder/firstthousand/_96Test.java
index 2bd48986d9..f293815a2b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_96Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_96Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._96;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _96Test {
-    private static _96.Solution1 solution1;
+    private _96.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _96.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_970Test.java b/src/test/java/com/fishercoder/firstthousand/_970Test.java
index fd8dde62bf..e41c8f6b8e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_970Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_970Test.java
@@ -5,17 +5,17 @@
 
 import java.util.Arrays;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _970Test {
-    private static _970.Solution1 solution1;
-    private static _970.Solution2 solution2;
+    private _970.Solution1 solution1;
+    private _970.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _970.Solution1();
         solution2 = new _970.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_973Test.java b/src/test/java/com/fishercoder/firstthousand/_973Test.java
index 0385867bde..b0425b49ec 100644
--- a/src/test/java/com/fishercoder/firstthousand/_973Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_973Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _973Test {
-    private static _973.Solution1 solution1;
-    private static _973.Solution2 solution2;
+    private _973.Solution1 solution1;
+    private _973.Solution2 solution2;
 
     @BeforeEach
     public void setUp() {
diff --git a/src/test/java/com/fishercoder/firstthousand/_974Test.java b/src/test/java/com/fishercoder/firstthousand/_974Test.java
index 2680b441f8..2f1692ef5e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_974Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_974Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._974;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _974Test {
 
-    private static _974.Solution1 test;
+    private _974.Solution1 test;
 
-    @BeforeClass
-    public static void setUp() {
+    @BeforeEach
+    public void setup() {
         test = new _974.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_976Test.java b/src/test/java/com/fishercoder/firstthousand/_976Test.java
index 7d236dfe1d..f94800bd67 100644
--- a/src/test/java/com/fishercoder/firstthousand/_976Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_976Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._976;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _976Test {
 
-    private static _976.Solution1 test;
+    private _976.Solution1 test;
 
-    @BeforeClass
-    public static void setUp() {
+    @BeforeEach
+    public void setup() {
         test = new _976.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_977Test.java b/src/test/java/com/fishercoder/firstthousand/_977Test.java
index f23d20399d..5a269205a3 100644
--- a/src/test/java/com/fishercoder/firstthousand/_977Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_977Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._977;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _977Test {
-    private static _977.Solution1 solution1;
-    private static _977.Solution2 solution2;
+    private _977.Solution1 solution1;
+    private _977.Solution2 solution2;
     private static int[] A;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _977.Solution1();
         solution2 = new _977.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_979Test.java b/src/test/java/com/fishercoder/firstthousand/_979Test.java
index 072a1a0ee3..f13a4a8fcf 100644
--- a/src/test/java/com/fishercoder/firstthousand/_979Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_979Test.java
@@ -3,14 +3,14 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._979;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _979Test {
-    private static _979.Solution1 solution1;
+    private _979.Solution1 solution1;
     private static TreeNode root;
 
     @Test
diff --git a/src/test/java/com/fishercoder/firstthousand/_97Test.java b/src/test/java/com/fishercoder/firstthousand/_97Test.java
index 1fc34d4f7f..9a9cfdbcf8 100644
--- a/src/test/java/com/fishercoder/firstthousand/_97Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_97Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._97;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _97Test {
-    private static _97.Solution1 solution1;
+    private _97.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _97.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_980Test.java b/src/test/java/com/fishercoder/firstthousand/_980Test.java
index 720804b88c..796f1ae31f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_980Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_980Test.java
@@ -1,12 +1,12 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._980;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _980Test {
-    private static _980.Solution1 solution1;
+    private _980.Solution1 solution1;
     private static int[][] grid;
 
     @Test
diff --git a/src/test/java/com/fishercoder/firstthousand/_985Test.java b/src/test/java/com/fishercoder/firstthousand/_985Test.java
index 52db2f0d4b..0006d4f75f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_985Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_985Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _985Test {
-    private static _985.Solution1 solution1;
+    private _985.Solution1 solution1;
     private static int[] expected;
     private static int[] actual;
     private static int[] A;
diff --git a/src/test/java/com/fishercoder/firstthousand/_986Test.java b/src/test/java/com/fishercoder/firstthousand/_986Test.java
index f121bbc65f..4b5740bd2e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_986Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_986Test.java
@@ -2,19 +2,19 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.firstthousand._986;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _986Test {
-    private static _986.Solution1 solution1;
+    private _986.Solution1 solution1;
     private static int[][] A;
     private static int[][] B;
     private static int[][] expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _986.Solution1();
     }
 
@@ -42,7 +42,7 @@ public void test1() {
         };
         int[][] actual = solution1.intervalIntersection(A, B);
         CommonUtils.print2DIntArray(actual);
-        assertEquals(expected, actual);
+        assertArrayEquals(expected, actual);
     }
 
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_987Test.java b/src/test/java/com/fishercoder/firstthousand/_987Test.java
index 38d03e9bb6..1f82ea7468 100644
--- a/src/test/java/com/fishercoder/firstthousand/_987Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_987Test.java
@@ -12,8 +12,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _987Test {
-    private static _987.Solution1 solution1;
-    private static _987.Solution2 solution2;
+    private _987.Solution1 solution1;
+    private _987.Solution2 solution2;
     private static TreeNode root;
     private static List<List<Integer>> expected;
     private static List<List<Integer>> actual;
diff --git a/src/test/java/com/fishercoder/firstthousand/_988Test.java b/src/test/java/com/fishercoder/firstthousand/_988Test.java
index 9f24dcd296..2ac6551492 100644
--- a/src/test/java/com/fishercoder/firstthousand/_988Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_988Test.java
@@ -3,19 +3,19 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._988;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _988Test {
-    private static _988.Solution1 solution1;
+    private _988.Solution1 solution1;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _988.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_989Test.java b/src/test/java/com/fishercoder/firstthousand/_989Test.java
index d532482788..defe8b968b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_989Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_989Test.java
@@ -2,17 +2,17 @@
 
 import com.fishercoder.solutions.firstthousand._989;
 import java.util.Arrays;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _989Test {
-  private static _989.Solution1 solution1;
+  private _989.Solution1 solution1;
   private static int[] A;
 
-  @BeforeClass
-  public static void setup() {
+  @BeforeEach
+    public void setUp() {
     solution1 = new _989.Solution1();
   }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_98Test.java b/src/test/java/com/fishercoder/firstthousand/_98Test.java
index e9dcef3ec2..39b64a3e7f 100644
--- a/src/test/java/com/fishercoder/firstthousand/_98Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_98Test.java
@@ -3,22 +3,22 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._98;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Created by fishercoder on 5/17/17.
  */
 public class _98Test {
-    private static _98.Solution1 solution1;
+    private _98.Solution1 solution1;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _98.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_993Test.java b/src/test/java/com/fishercoder/firstthousand/_993Test.java
index 9ac2de8f93..461cd4b4f7 100644
--- a/src/test/java/com/fishercoder/firstthousand/_993Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_993Test.java
@@ -3,20 +3,20 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._993;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _993Test {
-    private static _993.Solution1 solution1;
-    private static _993.Solution2 solution2;
+    private _993.Solution1 solution1;
+    private _993.Solution2 solution2;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setUp() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _993.Solution1();
         solution2 = new _993.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_994Test.java b/src/test/java/com/fishercoder/firstthousand/_994Test.java
index 57d066f338..fbc75387a1 100644
--- a/src/test/java/com/fishercoder/firstthousand/_994Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_994Test.java
@@ -8,9 +8,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _994Test {
-    private static _994.Solution1 solution1;
-    private static _994.Solution2 solution2;
-    private static _994.Solution3 solution3;
+    private _994.Solution1 solution1;
+    private _994.Solution2 solution2;
+    private _994.Solution3 solution3;
     private static int[][] grid;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_997Test.java b/src/test/java/com/fishercoder/firstthousand/_997Test.java
index b687c9c807..2168fc8cc0 100644
--- a/src/test/java/com/fishercoder/firstthousand/_997Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_997Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.firstthousand;
 
 import com.fishercoder.solutions.firstthousand._997;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _997Test {
-    private static _997.Solution1 solution1;
-    private static _997.Solution2 solution2;
+    private _997.Solution1 solution1;
+    private _997.Solution2 solution2;
     private static int[][] trust;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _997.Solution1();
         solution2 = new _997.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/firstthousand/_999Test.java b/src/test/java/com/fishercoder/firstthousand/_999Test.java
index 12e5a67b19..b89615d63e 100644
--- a/src/test/java/com/fishercoder/firstthousand/_999Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_999Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _999Test {
-    private static _999.Solution1 solution1;
+    private _999.Solution1 solution1;
     private static char[][] board;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/firstthousand/_99Test.java b/src/test/java/com/fishercoder/firstthousand/_99Test.java
index c1af8cad19..b15e633c65 100644
--- a/src/test/java/com/fishercoder/firstthousand/_99Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_99Test.java
@@ -3,15 +3,15 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._99;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _99Test {
-    private static _99.Solution1 solution1;
+    private _99.Solution1 solution1;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _99.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/firstthousand/_9Test.java b/src/test/java/com/fishercoder/firstthousand/_9Test.java
index ab2ffe82b2..6dc1baae9b 100644
--- a/src/test/java/com/fishercoder/firstthousand/_9Test.java
+++ b/src/test/java/com/fishercoder/firstthousand/_9Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _9Test {
-    private static _9.Solution1 solution1;
+    private _9.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3004Test.java b/src/test/java/com/fishercoder/fourththousand/_3004Test.java
index 9bcbb41a71..47649d2d33 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3004Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3004Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3004Test {
-    private static _3004.Solution1 solution1;
+    private _3004.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3006Test.java b/src/test/java/com/fishercoder/fourththousand/_3006Test.java
index abdb6731b8..b2e18b42f1 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3006Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3006Test.java
@@ -10,7 +10,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3006Test {
-    private static _3006.Solution1 solution1;
+    private _3006.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3016Test.java b/src/test/java/com/fishercoder/fourththousand/_3016Test.java
index 9bb4ada065..3f97e204d7 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3016Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3016Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3016Test {
-    private static _3016.Solution1 solution1;
+    private _3016.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3038Test.java b/src/test/java/com/fishercoder/fourththousand/_3038Test.java
index 4dd93fd26b..7abbb87be5 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3038Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3038Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3038Test {
-    private static _3038.Solution1 solution1;
+    private _3038.Solution1 solution1;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/fourththousand/_3074Test.java b/src/test/java/com/fishercoder/fourththousand/_3074Test.java
index 072c7383fc..f8597d3ead 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3074Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3074Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3074Test {
-    private static _3074.Solution1 solution1;
+    private _3074.Solution1 solution1;
     private static int[] apple;
     private static int[] capacity;
 
diff --git a/src/test/java/com/fishercoder/fourththousand/_3079Test.java b/src/test/java/com/fishercoder/fourththousand/_3079Test.java
index da6a111fa5..536f875489 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3079Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3079Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3079Test {
-    private static _3079.Solution1 solution1;
+    private _3079.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3083Test.java b/src/test/java/com/fishercoder/fourththousand/_3083Test.java
index 293b2d833e..f9b2f49aea 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3083Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3083Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class _3083Test {
-    private static _3083.Solution1 solution1;
+    private _3083.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3090Test.java b/src/test/java/com/fishercoder/fourththousand/_3090Test.java
index 120b9b86f3..4b6beb2323 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3090Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3090Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3090Test {
-    private static _3090.Solution1 solution1;
+    private _3090.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3095Test.java b/src/test/java/com/fishercoder/fourththousand/_3095Test.java
index f67adf6a25..eb2c3a61ee 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3095Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3095Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3095Test {
-    private static _3095.Solution1 solution1;
+    private _3095.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3112Test.java b/src/test/java/com/fishercoder/fourththousand/_3112Test.java
index 2d067b34ae..fa820b68de 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3112Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3112Test.java
@@ -8,7 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _3112Test {
-    private static _3112.Solution1 solution1;
+    private _3112.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3142Test.java b/src/test/java/com/fishercoder/fourththousand/_3142Test.java
index 7d46772e55..cabd98ea74 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3142Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3142Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3142Test {
-    private static _3142.Solution1 solution1;
+    private _3142.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3175Test.java b/src/test/java/com/fishercoder/fourththousand/_3175Test.java
index 67d1b9345b..6c2bfc6f07 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3175Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3175Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3175Test {
-    private static _3175.Solution1 solution1;
+    private _3175.Solution1 solution1;
     private static int[] skills;
     private static int k;
 
diff --git a/src/test/java/com/fishercoder/fourththousand/_3178Test.java b/src/test/java/com/fishercoder/fourththousand/_3178Test.java
index 04e87b406b..1d0d472dbc 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3178Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3178Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3178Test {
-    private static _3178.Solution1 solution1;
-    private static _3178.Solution2 solution2;
+    private _3178.Solution1 solution1;
+    private _3178.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3185Test.java b/src/test/java/com/fishercoder/fourththousand/_3185Test.java
index f9637fc1d2..391af9e267 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3185Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3185Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3185Test {
-    private static _3185.Solution1 solution1;
+    private _3185.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3186Test.java b/src/test/java/com/fishercoder/fourththousand/_3186Test.java
index 32918a2053..64e2f887ea 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3186Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3186Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3186Test {
-    private static _3186.Solution1 solution1;
+    private _3186.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3189Test.java b/src/test/java/com/fishercoder/fourththousand/_3189Test.java
index 6fcf941c99..0aa93f08d4 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3189Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3189Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3189Test {
-    private static _3189.Solution1 solution1;
+    private _3189.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3191Test.java b/src/test/java/com/fishercoder/fourththousand/_3191Test.java
index 2ba8f7f8f9..9e97747ee2 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3191Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3191Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3191Test {
-    private static _3191.Solution1 solution1;
+    private _3191.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3192Test.java b/src/test/java/com/fishercoder/fourththousand/_3192Test.java
index 7b4f5d129b..421382f4ce 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3192Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3192Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3192Test {
-    private static _3192.Solution1 solution1;
+    private _3192.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3196Test.java b/src/test/java/com/fishercoder/fourththousand/_3196Test.java
index a55a29b476..98e33d7b89 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3196Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3196Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3196Test {
-    private static _3196.Solution1 solution1;
+    private _3196.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3199Test.java b/src/test/java/com/fishercoder/fourththousand/_3199Test.java
index dfd2077917..041905b694 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3199Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3199Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3199Test {
-    private static _3199.Solution1 solution1;
+    private _3199.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3208Test.java b/src/test/java/com/fishercoder/fourththousand/_3208Test.java
index ed7261b303..e7e6509d2f 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3208Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3208Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3208Test {
-    private static _3208.Solution1 solution1;
+    private _3208.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3223Test.java b/src/test/java/com/fishercoder/fourththousand/_3223Test.java
index e9e2a0e94f..fc070436b9 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3223Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3223Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3223Test {
-    private static _3223.Solution1 solution1;
+    private _3223.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3224Test.java b/src/test/java/com/fishercoder/fourththousand/_3224Test.java
index 9775afd778..1e10cc4696 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3224Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3224Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3224Test {
-    private static _3224.Solution1 solution1;
+    private _3224.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3226Test.java b/src/test/java/com/fishercoder/fourththousand/_3226Test.java
index 2567e7d5f1..c9ea13abca 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3226Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3226Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3226Test {
-    private static _3226.Solution1 solution1;
+    private _3226.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3228Test.java b/src/test/java/com/fishercoder/fourththousand/_3228Test.java
index 77d9c63ee1..e28d83512b 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3228Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3228Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3228Test {
-    private static _3228.Solution1 solution1;
+    private _3228.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3233Test.java b/src/test/java/com/fishercoder/fourththousand/_3233Test.java
index 2f8545f5db..b1b7846bb0 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3233Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3233Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3233Test {
-    private static _3233.Solution1 solution1;
+    private _3233.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3234Test.java b/src/test/java/com/fishercoder/fourththousand/_3234Test.java
index c0ca988a0b..a2501cbc76 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3234Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3234Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3234Test {
-    private static _3234.Solution1 solution1;
+    private _3234.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3237Test.java b/src/test/java/com/fishercoder/fourththousand/_3237Test.java
index 409fc9a46d..6dcdbf6276 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3237Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3237Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _3237Test {
-    private static _3237.Solution1 solution1;
+    private _3237.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3240Test.java b/src/test/java/com/fishercoder/fourththousand/_3240Test.java
index f1a06d410a..1debc23ad2 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3240Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3240Test.java
@@ -8,7 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _3240Test {
-    private static _3240.Solution1 solution1;
+    private _3240.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3241Test.java b/src/test/java/com/fishercoder/fourththousand/_3241Test.java
index f6f6623452..31a6e82fef 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3241Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3241Test.java
@@ -8,7 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _3241Test {
-    private static _3241.Solution1 solution1;
+    private _3241.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/fourththousand/_3243Test.java b/src/test/java/com/fishercoder/fourththousand/_3243Test.java
index 057a7c3d20..c85ffcf516 100644
--- a/src/test/java/com/fishercoder/fourththousand/_3243Test.java
+++ b/src/test/java/com/fishercoder/fourththousand/_3243Test.java
@@ -8,7 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _3243Test {
-    private static _3243.Solution1 solution1;
+    private _3243.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1002Test.java b/src/test/java/com/fishercoder/secondthousand/_1002Test.java
index 06a17184be..f03bf2779f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1002Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1002Test.java
@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.Test;
 
 public class _1002Test {
-    private static _1002.Solution1 solution1;
+    private _1002.Solution1 solution1;
     private static String[] A;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/secondthousand/_1003Test.java b/src/test/java/com/fishercoder/secondthousand/_1003Test.java
index 9da93c601a..be5feb7eae 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1003Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1003Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1003;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class _1003Test {
-    private static _1003.Solution1 solution1;
+    private _1003.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1003.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1004Test.java b/src/test/java/com/fishercoder/secondthousand/_1004Test.java
index e469fd0641..4d4d82e161 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1004Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1004Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1004;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1004Test {
-    private static _1004.Solution1 solution1;
+    private _1004.Solution1 solution1;
     private static int[] A;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1004.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1005Test.java b/src/test/java/com/fishercoder/secondthousand/_1005Test.java
index c05b8999a7..157c54c770 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1005Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1005Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1005;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1005Test {
-    private static _1005.Solution1 solution1;
-    private static _1005.Solution2 solution2;
+    private _1005.Solution1 solution1;
+    private _1005.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1005.Solution1();
         solution2 = new _1005.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1008Test.java b/src/test/java/com/fishercoder/secondthousand/_1008Test.java
index 3c0b8b2080..377a152c87 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1008Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1008Test.java
@@ -3,15 +3,15 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1008;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1008Test {
-    private static _1008.Solution1 solution1;
-    private static _1008.Solution2 solution2;
+    private _1008.Solution1 solution1;
+    private _1008.Solution2 solution2;
     private static int[] preorder;
     private static TreeNode expected;
     private static TreeNode actual;
diff --git a/src/test/java/com/fishercoder/secondthousand/_1009Test.java b/src/test/java/com/fishercoder/secondthousand/_1009Test.java
index f77f7497d2..89b9c6d2c3 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1009Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1009Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1009;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1009Test {
-    private static _1009.Solution1 solution1;
+    private _1009.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1009.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1010Test.java b/src/test/java/com/fishercoder/secondthousand/_1010Test.java
index 7ac45c08da..f630eb29d3 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1010Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1010Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1010;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1010Test {
-    private static _1010.Solution1 solution1;
-    private static _1010.Solution2 solution2;
+    private _1010.Solution1 solution1;
+    private _1010.Solution2 solution2;
     private static int[] time;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1010.Solution1();
         solution2 = new _1010.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1011Test.java b/src/test/java/com/fishercoder/secondthousand/_1011Test.java
index 0a2520c2e2..ec0b1922a1 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1011Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1011Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1011;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1011Test {
-    private static _1011.Solution1 solution1;
+    private _1011.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1011.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1013Test.java b/src/test/java/com/fishercoder/secondthousand/_1013Test.java
index d057ab8f1c..96189ff3d7 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1013Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1013Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1013;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1013Test {
-    private static _1013.Solution1 solution1;
+    private _1013.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1013.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1014Test.java b/src/test/java/com/fishercoder/secondthousand/_1014Test.java
index 31fc1a46d1..7e497a73a9 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1014Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1014Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1014;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1014Test {
-    private static _1014.Solution1 solution1;
+    private _1014.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1014.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1018Test.java b/src/test/java/com/fishercoder/secondthousand/_1018Test.java
index 6d8d90dee9..1ebcc9599a 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1018Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1018Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1018;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1018Test {
-    private static _1018.Solution1 solution1;
+    private _1018.Solution1 solution1;
     private static int[] A;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1018.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1019Test.java b/src/test/java/com/fishercoder/secondthousand/_1019Test.java
index 72b770bc5d..fb17ec81d8 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1019Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1019Test.java
@@ -3,16 +3,16 @@
 import com.fishercoder.common.classes.ListNode;
 import com.fishercoder.common.utils.LinkedListUtils;
 import com.fishercoder.solutions.secondthousand._1019;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1019Test {
-    private static _1019.Solution1 solution1;
+    private _1019.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1019.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1020Test.java b/src/test/java/com/fishercoder/secondthousand/_1020Test.java
index b7a901dda1..32940c8ce1 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1020Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1020Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1020;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1020Test {
-    private static _1020.Solution1 solution1;
+    private _1020.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1020.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1021Test.java b/src/test/java/com/fishercoder/secondthousand/_1021Test.java
index 947acaffdd..f232340e0f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1021Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1021Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1021;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1021Test {
-    private static _1021.Solution1 solution1;
+    private _1021.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1021.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1022Test.java b/src/test/java/com/fishercoder/secondthousand/_1022Test.java
index 8a12a51617..41f4dbd2cc 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1022Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1022Test.java
@@ -3,19 +3,19 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1022;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1022Test {
-    private static _1022.Solution1 solution1;
+    private _1022.Solution1 solution1;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1022.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1024Test.java b/src/test/java/com/fishercoder/secondthousand/_1024Test.java
index 5a75059fb8..9ff428cbdb 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1024Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1024Test.java
@@ -2,16 +2,16 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.secondthousand._1024;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1024Test {
-    private static _1024.Solution1 solution1;
+    private _1024.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1024.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1025Test.java b/src/test/java/com/fishercoder/secondthousand/_1025Test.java
index fc10bf2a91..ed35777239 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1025Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1025Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1025;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@Ignore
+@Disabled
 public class _1025Test {
-    private static _1025.Solution1 solution1;
+    private _1025.Solution1 solution1;
 
-    @Before
+    @BeforeEach
     public void setup() {
         solution1 = new _1025.Solution1();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1026Test.java b/src/test/java/com/fishercoder/secondthousand/_1026Test.java
index 3c36d6bb73..701cd29eaf 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1026Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1026Test.java
@@ -3,14 +3,14 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1026;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1026Test {
-    private static _1026.Solution1 solution1;
+    private _1026.Solution1 solution1;
     private static TreeNode root;
 
     @Test
diff --git a/src/test/java/com/fishercoder/secondthousand/_1029Test.java b/src/test/java/com/fishercoder/secondthousand/_1029Test.java
index e5a36b0bff..6b74190dcf 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1029Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1029Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1029;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1029Test {
-    private static _1029.Solution1 solution1;
+    private _1029.Solution1 solution1;
     private static int[][] costs;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1029.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1030Test.java b/src/test/java/com/fishercoder/secondthousand/_1030Test.java
index 3466957e73..34884f7dbb 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1030Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1030Test.java
@@ -2,14 +2,14 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.secondthousand._1030;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _1030Test {
-    private static _1030.Solution1 solution1;
+    private _1030.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1030.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1033Test.java b/src/test/java/com/fishercoder/secondthousand/_1033Test.java
index fca1119784..3b167e6eef 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1033Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1033Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1033;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1033Test {
-    private static _1033.Solution1 solution1;
+    private _1033.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1033.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1034Test.java b/src/test/java/com/fishercoder/secondthousand/_1034Test.java
index 5803b4c25c..fc9f40884c 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1034Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1034Test.java
@@ -8,7 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1034Test {
-    private static _1034.Solution1 solution1;
+    private _1034.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1037Test.java b/src/test/java/com/fishercoder/secondthousand/_1037Test.java
index d2bb44cc64..d39b2ef230 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1037Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1037Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1037;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1037Test {
-    private static _1037.Solution1 solution1;
+    private _1037.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1037.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1038Test.java b/src/test/java/com/fishercoder/secondthousand/_1038Test.java
index 761b32f00d..65b4a2ca1e 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1038Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1038Test.java
@@ -3,22 +3,22 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1038;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1038Test {
     
-    private static _1038.Solution1 solution1;
+    private _1038.Solution1 solution1;
     private static TreeNode root;
     private static TreeNode expected;
     private static TreeNode actual;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1038.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1043Test.java b/src/test/java/com/fishercoder/secondthousand/_1043Test.java
index 6b35c8a0cc..e63d43d9fb 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1043Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1043Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1043;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1043Test {
-    private static _1043.Solution1 solution1;
+    private _1043.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1043.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1046Test.java b/src/test/java/com/fishercoder/secondthousand/_1046Test.java
index 8063c93f2f..2a57b75be4 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1046Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1046Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1046;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1046Test {
-    private static _1046.Solution1 solution1;
+    private _1046.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1046.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1047Test.java b/src/test/java/com/fishercoder/secondthousand/_1047Test.java
index 86f4de624f..5afb48ea83 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1047Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1047Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1047;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1047Test {
-    private static _1047.Solution1 solution1;
+    private _1047.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1047.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1049Test.java b/src/test/java/com/fishercoder/secondthousand/_1049Test.java
index a0f063a303..ff99f779a1 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1049Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1049Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1049;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1049Test {
-    private static _1049.Solution1 solution1;
+    private _1049.Solution1 solution1;
     private static int[] stones;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1049.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1051Test.java b/src/test/java/com/fishercoder/secondthousand/_1051Test.java
index 88f92d3356..0cb7b55bf7 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1051Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1051Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1051;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1051Test {
-    private static _1051.Solution1 solution1;
+    private _1051.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1051.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1055Test.java b/src/test/java/com/fishercoder/secondthousand/_1055Test.java
index 708a2fb602..a71276c996 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1055Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1055Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1055;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1055Test {
-    private static _1055.Solution1 solution1;
+    private _1055.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1055.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1056Test.java b/src/test/java/com/fishercoder/secondthousand/_1056Test.java
index 69ae1dbd30..92df0fd4a2 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1056Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1056Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1056;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1056Test {
-    private static _1056.Solution1 solution1;
+    private _1056.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1056.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1057Test.java b/src/test/java/com/fishercoder/secondthousand/_1057Test.java
index 57b1efde90..ca7586e404 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1057Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1057Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1057;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1057Test {
-    private static _1057.Solution1 solution1;
+    private _1057.Solution1 solution1;
     private static int[][] workers;
     private static int[][] bikes;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1057.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1059Test.java b/src/test/java/com/fishercoder/secondthousand/_1059Test.java
index 7d75a2ae18..5c40493564 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1059Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1059Test.java
@@ -9,7 +9,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class _1059Test {
-    private static _1059.Solution1 solution1;
+    private _1059.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1060Test.java b/src/test/java/com/fishercoder/secondthousand/_1060Test.java
index 6f4b1380ca..f6ceab1cb7 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1060Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1060Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1060Test {
-    private static _1060.Solution1 solution1;
-    private static _1060.Solution2 solution2;
+    private _1060.Solution1 solution1;
+    private _1060.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1061Test.java b/src/test/java/com/fishercoder/secondthousand/_1061Test.java
index ae98d45903..5614098177 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1061Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1061Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1061;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1061Test {
-    private static _1061.Solution1 solution1;
+    private _1061.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1061.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1062Test.java b/src/test/java/com/fishercoder/secondthousand/_1062Test.java
index 8604731f18..9b36496a78 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1062Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1062Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1062Test {
-    private static _1062.Solution1 solution1;
+    private _1062.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1065Test.java b/src/test/java/com/fishercoder/secondthousand/_1065Test.java
index 7ae2a74c1b..e741345a9c 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1065Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1065Test.java
@@ -2,14 +2,14 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.secondthousand._1065;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _1065Test {
-    private static _1065.Solution1 solution1;
+    private _1065.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1065.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1066Test.java b/src/test/java/com/fishercoder/secondthousand/_1066Test.java
index b5c718c636..255475061e 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1066Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1066Test.java
@@ -1,12 +1,12 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1066;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1066Test {
-    private static _1066.Solution1 solution1;
+    private _1066.Solution1 solution1;
     private static int[][] workers;
     private static int[][] bikes;
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1071Test.java b/src/test/java/com/fishercoder/secondthousand/_1071Test.java
index 23e577fb43..742fe38c1d 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1071Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1071Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1071;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1071Test {
-    private static _1071.Solution1 solution1;
+    private _1071.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1071.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1078Test.java b/src/test/java/com/fishercoder/secondthousand/_1078Test.java
index 8633bcf3b7..9fc104cea6 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1078Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1078Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1078;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1078Test {
-    private static _1078.Solution1 solution1;
+    private _1078.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1078.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1079Test.java b/src/test/java/com/fishercoder/secondthousand/_1079Test.java
index 0467d47964..0360b619d5 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1079Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1079Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1079;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1079Test {
-    private static _1079.Solution1 solution1;
+    private _1079.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1079.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1080Test.java b/src/test/java/com/fishercoder/secondthousand/_1080Test.java
index 935e8e2e60..0e3f0bf544 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1080Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1080Test.java
@@ -11,7 +11,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1080Test {
-    private static _1080.Solution1 solution1;
+    private _1080.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1085Test.java b/src/test/java/com/fishercoder/secondthousand/_1085Test.java
index 45b48d5d11..8554e24a8b 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1085Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1085Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1085;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1085Test {
-    private static _1085.Solution1 solution1;
+    private _1085.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1085.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1086Test.java b/src/test/java/com/fishercoder/secondthousand/_1086Test.java
index 79334b303f..9a167a3e6f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1086Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1086Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1086;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1086Test {
-    private static _1086.Solution1 solution1;
-    private static _1086.Solution2 solution2;
+    private _1086.Solution1 solution1;
+    private _1086.Solution2 solution2;
     private static int[][] items;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1086.Solution1();
         solution2 = new _1086.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1087Test.java b/src/test/java/com/fishercoder/secondthousand/_1087Test.java
index 8859880f28..cdb37d9419 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1087Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1087Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1087;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1087Test {
-    private static _1087.Solution1 solution1;
-    private static _1087.Solution2 solution2;
+    private _1087.Solution1 solution1;
+    private _1087.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1087.Solution1();
         solution2 = new _1087.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1089Test.java b/src/test/java/com/fishercoder/secondthousand/_1089Test.java
index afe68d8ae9..3271faef3a 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1089Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1089Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1089;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1089Test {
-    private static _1089.Solution1 solution1;
+    private _1089.Solution1 solution1;
     private static int[] arr;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1089.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1090Test.java b/src/test/java/com/fishercoder/secondthousand/_1090Test.java
index b4f0404855..f52f93b3d9 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1090Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1090Test.java
@@ -1,15 +1,15 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1090;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1090Test {
-    private static _1090.Solution1 solution1;
+    private _1090.Solution1 solution1;
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         solution1 = new _1090.Solution1();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1091Test.java b/src/test/java/com/fishercoder/secondthousand/_1091Test.java
index f0d69b9648..9c7c62dde1 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1091Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1091Test.java
@@ -2,16 +2,16 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.secondthousand._1091;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1091Test {
-    private static _1091.Solution1 solution1;
+    private _1091.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1091.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1094Test.java b/src/test/java/com/fishercoder/secondthousand/_1094Test.java
index 6503882033..80e55e654b 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1094Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1094Test.java
@@ -2,18 +2,18 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.secondthousand._1094;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1094Test {
-    private static _1094.Solution1 solution1;
+    private _1094.Solution1 solution1;
     private static int[][] trips;
     private static int capacity;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1094.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1099Test.java b/src/test/java/com/fishercoder/secondthousand/_1099Test.java
index 360abec21a..3dac98fb52 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1099Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1099Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1099;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1099Test {
-    private static _1099.Solution1 solution1;
-    private static _1099.Solution2 solution2;
+    private _1099.Solution1 solution1;
+    private _1099.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1099.Solution1();
         solution2 = new _1099.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1100Test.java b/src/test/java/com/fishercoder/secondthousand/_1100Test.java
index b481c0805b..efa69bf59e 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1100Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1100Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1100;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1100Test {
-    private static _1100.Solution1 solution1;
+    private _1100.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1100.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1103Test.java b/src/test/java/com/fishercoder/secondthousand/_1103Test.java
index 3cc0c231bf..9b59d9f9b4 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1103Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1103Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1103;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1103Test {
-    private static _1103.Solution1 solution1;
+    private _1103.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1103.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1104Test.java b/src/test/java/com/fishercoder/secondthousand/_1104Test.java
index e3b859ca3e..58246bb2fc 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1104Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1104Test.java
@@ -1,22 +1,22 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1104;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1104Test {
-    private static _1104.Solution1 solution1;
-    private static _1104.Solution2 solution2;
+    private _1104.Solution1 solution1;
+    private _1104.Solution2 solution2;
     private static List<Integer> expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1104.Solution1();
         solution2 = new _1104.Solution2();
     }
@@ -52,7 +52,7 @@ public void test5() {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void test6() {
         //takes too long to finish, ignore to let build pass
         expected = Arrays.asList(1, 2, 6, 11, 24, 47, 97, 188, 390, 754, 1562, 3018, 6250, 12075, 25000, 48303, 100000);
@@ -60,7 +60,7 @@ public void test6() {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void test7() {
         //takes too long to finish, ignore to let build pass
         expected = Arrays.asList(1, 3, 5, 12, 23, 48, 94, 195, 377, 781, 1509, 3125, 6037, 12500, 24151, 50000, 96607, 200000);
@@ -68,7 +68,7 @@ public void test7() {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void test8() {
         //takes too long to finish, ignore to let build pass
         expected = Arrays.asList(1, 2, 6, 11, 24, 47, 97, 188, 390, 754, 1562, 3018, 6250, 12075, 25000, 48303, 100000, 193215, 400000);
@@ -76,7 +76,7 @@ public void test8() {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void test9() {
         //takes too long to finish, ignore to let build pass
         expected = Arrays.asList(1, 2, 7, 8, 30, 34, 122, 139, 488, 559, 1953, 2237, 7812, 8950, 31250, 35803, 125000, 143215, 500000);
diff --git a/src/test/java/com/fishercoder/secondthousand/_1105Test.java b/src/test/java/com/fishercoder/secondthousand/_1105Test.java
index 95297aa137..4264f29578 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1105Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1105Test.java
@@ -8,7 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1105Test {
-    private static _1105.Solution1 solution1;
+    private _1105.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1108Test.java b/src/test/java/com/fishercoder/secondthousand/_1108Test.java
index 1a5fa21f8d..23f8caf9dc 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1108Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1108Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1108;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1108Test {
-    private static _1108.Solution1 solution1;
-    private static _1108.Solution2 solution2;
+    private _1108.Solution1 solution1;
+    private _1108.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1108.Solution1();
         solution2 = new _1108.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1110Test.java b/src/test/java/com/fishercoder/secondthousand/_1110Test.java
index f2beb98262..d0665ed19f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1110Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1110Test.java
@@ -11,9 +11,9 @@
 
 
 public class _1110Test {
-    private static _1110.Solution1 solution1;
-    private static _1110.Solution2 solution2;
-    private static _1110.Solution3 solution3;
+    private _1110.Solution1 solution1;
+    private _1110.Solution2 solution2;
+    private _1110.Solution3 solution3;
     private static TreeNode root;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/secondthousand/_1118Test.java b/src/test/java/com/fishercoder/secondthousand/_1118Test.java
index d943daa133..1bca1f551a 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1118Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1118Test.java
@@ -1,15 +1,15 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1118;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1118Test {
-    private static _1118.Solution1 solution1;
+    private _1118.Solution1 solution1;
 
-    @Before
+    @BeforeEach
     public void setupForEachTest() {
         solution1 = new _1118.Solution1();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1119Test.java b/src/test/java/com/fishercoder/secondthousand/_1119Test.java
index 0ae5cba7b7..26574ab978 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1119Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1119Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1119;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1119Test {
-    private static _1119.Solution1 solution1;
-    private static _1119.Solution2 solution2;
+    private _1119.Solution1 solution1;
+    private _1119.Solution2 solution2;
     private static String S;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1119.Solution1();
         solution2 = new _1119.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1122Test.java b/src/test/java/com/fishercoder/secondthousand/_1122Test.java
index c894cf627f..08769b0767 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1122Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1122Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1122;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1122Test {
-    private static _1122.Solution1 solution1;
+    private _1122.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1122.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1128Test.java b/src/test/java/com/fishercoder/secondthousand/_1128Test.java
index ac88ec6259..fa43ec56c7 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1128Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1128Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1128;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1128Test {
-    private static _1128.Solution1 solution1;
+    private _1128.Solution1 solution1;
     private static int[][] dominoes;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1128.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1133Test.java b/src/test/java/com/fishercoder/secondthousand/_1133Test.java
index e316c57cf7..f64d1cc430 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1133Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1133Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1133;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1133Test {
-    private static _1133.Solution1 solution1;
-    private static _1133.Solution2 solution2;
+    private _1133.Solution1 solution1;
+    private _1133.Solution2 solution2;
     private static int[] A;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1133.Solution1();
         solution2 = new _1133.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1134Test.java b/src/test/java/com/fishercoder/secondthousand/_1134Test.java
index 66963ef157..9948a6b1f8 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1134Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1134Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1134;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1134Test {
-    private static _1134.Solution1 solution1;
+    private _1134.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1134.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1136Test.java b/src/test/java/com/fishercoder/secondthousand/_1136Test.java
index fa3e386510..99c3c7e605 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1136Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1136Test.java
@@ -8,8 +8,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1136Test {
-    private static _1136.Solution1 solution1;
-    private static _1136.Solution2 solution2;
+    private _1136.Solution1 solution1;
+    private _1136.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1137Test.java b/src/test/java/com/fishercoder/secondthousand/_1137Test.java
index 57acdebc78..e39439038e 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1137Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1137Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1137;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1137Test {
-    private static _1137.Solution1 solution1;
+    private _1137.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1137.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1138Test.java b/src/test/java/com/fishercoder/secondthousand/_1138Test.java
index 8848e14d9a..8d579ad191 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1138Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1138Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1138;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1138Test {
-    private static _1138.Solution1 solution1;
+    private _1138.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1138.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1143Test.java b/src/test/java/com/fishercoder/secondthousand/_1143Test.java
index 1549208e34..d031592605 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1143Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1143Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1143;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1143Test {
-    private static _1143.Solution1 solution1;
+    private _1143.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1143.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1145Test.java b/src/test/java/com/fishercoder/secondthousand/_1145Test.java
index 60d8eec55a..476571ed77 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1145Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1145Test.java
@@ -3,23 +3,23 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1145;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1145Test {
 
-    private static _1145.Solution1 solution1;
+    private _1145.Solution1 solution1;
     private static TreeNode root;
     private static int n;
     private static int x;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1145.Solution1();
     }
 
@@ -28,6 +28,6 @@ public void test1() {
         root = TreeUtils.constructBinaryTree(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11));
         n = 11;
         x = 3;
-        Assert.assertEquals(true, solution1.btreeGameWinningMove(root, n, x));
+        Assertions.assertEquals(true, solution1.btreeGameWinningMove(root, n, x));
     }
 }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1146Test.java b/src/test/java/com/fishercoder/secondthousand/_1146Test.java
index 4bb2da8cdd..9e65e24e19 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1146Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1146Test.java
@@ -4,10 +4,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1146Test {
-    private static _1146.Solution1.SnapshotArray snapshotArray;
+    private _1146.Solution1.SnapshotArray snapshotArray;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1150Test.java b/src/test/java/com/fishercoder/secondthousand/_1150Test.java
index fed15144b6..86252dc0f4 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1150Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1150Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1150;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1150Test {
-    private static _1150.Solution1 solution1;
+    private _1150.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1150.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1151Test.java b/src/test/java/com/fishercoder/secondthousand/_1151Test.java
index 9aed734246..8af98839f3 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1151Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1151Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1151Test {
-    private static _1151.Solution1 solution1;
+    private _1151.Solution1 solution1;
     private static int[] data;
     private static int expected;
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1152Test.java b/src/test/java/com/fishercoder/secondthousand/_1152Test.java
index b0f9ac3427..78f01861f3 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1152Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1152Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1152;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1152Test {
-    private static _1152.Solution1 solution1;
+    private _1152.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1152.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1154Test.java b/src/test/java/com/fishercoder/secondthousand/_1154Test.java
index 2b31de8377..bf9f36a2a5 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1154Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1154Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1154;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1154Test {
-    private static _1154.Solution1 solution1;
+    private _1154.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1154.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1160Test.java b/src/test/java/com/fishercoder/secondthousand/_1160Test.java
index 77de32105b..d64bbc3f36 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1160Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1160Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1160;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1160Test {
-    private static _1160.Solution1 solution1;
+    private _1160.Solution1 solution1;
     private static String[] words;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1160.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1161Test.java b/src/test/java/com/fishercoder/secondthousand/_1161Test.java
index 59ba4bf8d2..2054e6d3fe 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1161Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1161Test.java
@@ -3,18 +3,18 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1161;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1161Test {
-    private static _1161.Solution1 solution1;
+    private _1161.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1161.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1165Test.java b/src/test/java/com/fishercoder/secondthousand/_1165Test.java
index b366aa0435..57a9a7e58e 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1165Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1165Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1165;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1165Test {
-    private static _1165.Solution1 solution1;
+    private _1165.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1165.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1170Test.java b/src/test/java/com/fishercoder/secondthousand/_1170Test.java
index 4aad893450..25653583d5 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1170Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1170Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1170;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1170Test {
-    private static _1170.Solution1 solution1;
-    private static _1170.Solution2 solution2;
+    private _1170.Solution1 solution1;
+    private _1170.Solution2 solution2;
     private static String[] queries;
     private static String[] words;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1170.Solution1();
         solution2 = new _1170.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1171Test.java b/src/test/java/com/fishercoder/secondthousand/_1171Test.java
index c4fe3b6744..eac578ec60 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1171Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1171Test.java
@@ -2,17 +2,17 @@
 
 import com.fishercoder.common.utils.LinkedListUtils;
 import com.fishercoder.solutions.secondthousand._1171;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1171Test {
-    private static _1171.Solution1 solution1;
-    private static _1171.Solution2 solution2;
+    private _1171.Solution1 solution1;
+    private _1171.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1171.Solution1();
         solution2 = new _1171.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1175Test.java b/src/test/java/com/fishercoder/secondthousand/_1175Test.java
index b7eb9bc5da..0422183f3a 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1175Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1175Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1175;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@Ignore
+@Disabled
 public class _1175Test {
-    private static _1175.Solution1 solution1;
+    private _1175.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1175.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1176Test.java b/src/test/java/com/fishercoder/secondthousand/_1176Test.java
index cb4ff81139..98271a5834 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1176Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1176Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1176;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1176Test {
-    private static _1176.Solution1 solution1;
+    private _1176.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1176.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1180Test.java b/src/test/java/com/fishercoder/secondthousand/_1180Test.java
index 6371738212..578e0a6c16 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1180Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1180Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1180;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1180Test {
-    private static _1180.Solution1 solution1;
+    private _1180.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1180.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1182Test.java b/src/test/java/com/fishercoder/secondthousand/_1182Test.java
index 86a0f5b7f7..b31428d113 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1182Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1182Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1182;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1182Test {
-    private static _1182.Solution1 solution1;
+    private _1182.Solution1 solution1;
     private static int[] colors;
     private static int[][] queries;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1182.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1184Test.java b/src/test/java/com/fishercoder/secondthousand/_1184Test.java
index 2f2fcb243f..989f30b867 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1184Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1184Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1184;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1184Test {
-    private static _1184.Solution1 solution1;
+    private _1184.Solution1 solution1;
     private static int[] distance;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1184.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1185Test.java b/src/test/java/com/fishercoder/secondthousand/_1185Test.java
index 0eec715897..60dc07f99e 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1185Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1185Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1185;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1185Test {
-    private static _1185.Solution1 solution1;
+    private _1185.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1185.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1189Test.java b/src/test/java/com/fishercoder/secondthousand/_1189Test.java
index ebcf9a073c..6ef6bd076f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1189Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1189Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1189;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1189Test {
-    private static _1189.Solution1 solution1;
+    private _1189.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1189.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1190Test.java b/src/test/java/com/fishercoder/secondthousand/_1190Test.java
index 653edc7f6f..f60dc44388 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1190Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1190Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1190Test {
-    private static _1190.Solution1 solution1;
-    private static _1190.Solution2 solution2;
+    private _1190.Solution1 solution1;
+    private _1190.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1196Test.java b/src/test/java/com/fishercoder/secondthousand/_1196Test.java
index c9f70b2775..d1c9e10d91 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1196Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1196Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1196;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1196Test {
-    private static _1196.Solution1 solution1;
+    private _1196.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1196.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1197Test.java b/src/test/java/com/fishercoder/secondthousand/_1197Test.java
index 9d9cd1f1cc..fbd85da64d 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1197Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1197Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1197Test {
-    private static _1197.Solution1 solution1;
+    private _1197.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1198Test.java b/src/test/java/com/fishercoder/secondthousand/_1198Test.java
index 6f5bf21488..829363c520 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1198Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1198Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1198;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1198Test {
-    private static _1198.Solution1 solution1;
+    private _1198.Solution1 solution1;
     private static int[][] mat;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1198.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1200Test.java b/src/test/java/com/fishercoder/secondthousand/_1200Test.java
index 5984ff7628..694aa60453 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1200Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1200Test.java
@@ -1,22 +1,22 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1200;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1200Test {
-    private static _1200.Solution1 solution1;
+    private _1200.Solution1 solution1;
     private static int[] arr;
     private static List<List<Integer>> expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1200.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1207Test.java b/src/test/java/com/fishercoder/secondthousand/_1207Test.java
index a19837011e..482cd1b3bd 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1207Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1207Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1207;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1207Test {
-    private static _1207.Solution1 solution1;
+    private _1207.Solution1 solution1;
     private static int[] arr;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1207.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1209Test.java b/src/test/java/com/fishercoder/secondthousand/_1209Test.java
index e27f1a8753..80e843741d 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1209Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1209Test.java
@@ -8,10 +8,10 @@
 
 public class _1209Test {
 
-    private static _1209.Solution1 solution1;
-    private static _1209.Solution2 solution2;
-    private static _1209.Solution3 solution3;
-    private static _1209.Solution4 solution4;
+    private _1209.Solution1 solution1;
+    private _1209.Solution2 solution2;
+    private _1209.Solution3 solution3;
+    private _1209.Solution4 solution4;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1213Test.java b/src/test/java/com/fishercoder/secondthousand/_1213Test.java
index d5a03a1292..a6e92cfb66 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1213Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1213Test.java
@@ -2,14 +2,14 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.secondthousand._1213;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _1213Test {
-    private static _1213.Solution1 solution1;
+    private _1213.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1213.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1214Test.java b/src/test/java/com/fishercoder/secondthousand/_1214Test.java
index f68cdce170..57c8b40aa0 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1214Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1214Test.java
@@ -3,20 +3,20 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1214;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1214Test {
-    private static _1214.Solution1 solution1;
+    private _1214.Solution1 solution1;
     private static TreeNode root1;
     private static TreeNode root2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1214.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1217Test.java b/src/test/java/com/fishercoder/secondthousand/_1217Test.java
index 953095b395..6167612f3d 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1217Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1217Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1217;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1217Test {
-    private static _1217.Solution1 solution1;
+    private _1217.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1217.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1219Test.java b/src/test/java/com/fishercoder/secondthousand/_1219Test.java
index 54099b55e6..5eb04ed450 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1219Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1219Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1219;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1219Test {
-    private static _1219.Solution1 solution1;
+    private _1219.Solution1 solution1;
     private static int[][] grid;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1219.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1221Test.java b/src/test/java/com/fishercoder/secondthousand/_1221Test.java
index d96dfb9ed1..d30219729f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1221Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1221Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1221;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1221Test {
-    private static _1221.Solution1 solution1;
-    private static _1221.Solution2 solution2;
+    private _1221.Solution1 solution1;
+    private _1221.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1221.Solution1();
         solution2 = new _1221.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1228Test.java b/src/test/java/com/fishercoder/secondthousand/_1228Test.java
index f5eeb5c08d..5a290f06b9 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1228Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1228Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1228;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1228Test {
-    private static _1228.Solution1 solution1;
-    private static _1228.Solution2 solution2;
+    private _1228.Solution1 solution1;
+    private _1228.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1228.Solution1();
         solution2 = new _1228.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1230Test.java b/src/test/java/com/fishercoder/secondthousand/_1230Test.java
index 34ee76a0aa..29368c705f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1230Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1230Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1230Test {
-    private static _1230.Solution1 solution1;
+    private _1230.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1232Test.java b/src/test/java/com/fishercoder/secondthousand/_1232Test.java
index 764f4b1b0e..51c08f73a4 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1232Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1232Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1232;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1232Test {
-    private static _1232.Solution1 solution1;
+    private _1232.Solution1 solution1;
     private static int[][] coordinates;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1232.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1243Test.java b/src/test/java/com/fishercoder/secondthousand/_1243Test.java
index 683aed5f0b..eeb6d9e95c 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1243Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1243Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1243;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.TestCase.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class _1243Test {
-    private static _1243.Solution1 solution1;
+    private _1243.Solution1 solution1;
     private static int[] arr;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1243.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1249Test.java b/src/test/java/com/fishercoder/secondthousand/_1249Test.java
index 7b80f7caab..9b229ee45e 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1249Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1249Test.java
@@ -1,15 +1,15 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1249;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _1249Test {
-    private static _1249.Solution1 solution1;
-    private static _1249.Solution2 solution2;
+    private _1249.Solution1 solution1;
+    private _1249.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1249.Solution1();
         solution2 = new _1249.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1252Test.java b/src/test/java/com/fishercoder/secondthousand/_1252Test.java
index 2fbfa5a2b6..4d49bb377b 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1252Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1252Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1252;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1252Test {
-    private static _1252.Solution1 solution1;
-    private static _1252.Solution2 solution2;
+    private _1252.Solution1 solution1;
+    private _1252.Solution2 solution2;
     private static int[][] indices;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1252.Solution1();
         solution2 = new _1252.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1257Test.java b/src/test/java/com/fishercoder/secondthousand/_1257Test.java
index a2d15b456d..010d11be82 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1257Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1257Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1257;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1257Test {
-    private static _1257.Solution1 solution1;
+    private _1257.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1257.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1258Test.java b/src/test/java/com/fishercoder/secondthousand/_1258Test.java
index c5bd7d01e1..baca135788 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1258Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1258Test.java
@@ -1,21 +1,21 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1258;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1258Test {
 
-    private static _1258.Solution1 solution1;
+    private _1258.Solution1 solution1;
     private static List<List<String>> synonyms;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1258.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1260Test.java b/src/test/java/com/fishercoder/secondthousand/_1260Test.java
index bec52db536..b297e9886f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1260Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1260Test.java
@@ -1,21 +1,21 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1260;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1260Test {
-    private static _1260.Solution1 solution1;
+    private _1260.Solution1 solution1;
     private static int[][] grid;
     private static List<List<Integer>> expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1260.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1266Test.java b/src/test/java/com/fishercoder/secondthousand/_1266Test.java
index 8aac668e87..6387017bd1 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1266Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1266Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1266;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1266Test {
-    private static _1266.Solution1 solution1;
+    private _1266.Solution1 solution1;
     private static int[][] points;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1266.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1267Test.java b/src/test/java/com/fishercoder/secondthousand/_1267Test.java
index 7db3da3c51..806455438f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1267Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1267Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1267;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1267Test {
-    private static _1267.Solution1 solution1;
+    private _1267.Solution1 solution1;
     private static int[][] grid;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1267.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1268Test.java b/src/test/java/com/fishercoder/secondthousand/_1268Test.java
index 5b06cc6065..93b095f8e0 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1268Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1268Test.java
@@ -1,21 +1,21 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1268;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1268Test {
-    private static _1268.Solution1 solution1;
+    private _1268.Solution1 solution1;
     private static List<List<String>> expected;
     private static String[] products;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1268.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1271Test.java b/src/test/java/com/fishercoder/secondthousand/_1271Test.java
index aaaa4fd768..714b119d38 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1271Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1271Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1271;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1271Test {
-    private static _1271.Solution1 solution1;
+    private _1271.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1271.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1273Test.java b/src/test/java/com/fishercoder/secondthousand/_1273Test.java
index ed5f404bc8..1c69a9f43b 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1273Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1273Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1273;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1273Test {
-    private static _1273.Solution1 solution1;
+    private _1273.Solution1 solution1;
     private static int[] parent;
     private static int[] value;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1273.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1275Test.java b/src/test/java/com/fishercoder/secondthousand/_1275Test.java
index 58509a3245..c4426d0477 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1275Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1275Test.java
@@ -1,22 +1,22 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1275;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1275Test {
-    private static _1275.Solution1 solution1;
+    private _1275.Solution1 solution1;
     private static int[][] moves;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1275.Solution1();
     }
 
-    @Before
+    @BeforeEach
     public void clear() {
         solution1 = new _1275.Solution1();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1277Test.java b/src/test/java/com/fishercoder/secondthousand/_1277Test.java
index 3122f4192b..b29a08dbb1 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1277Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1277Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1277;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1277Test {
-    private static _1277.Solution1 solution1;
-    private static _1277.Solution2 solution2;
+    private _1277.Solution1 solution1;
+    private _1277.Solution2 solution2;
     private static int[][] matrix;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1277.Solution1();
         solution2 = new _1277.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1281Test.java b/src/test/java/com/fishercoder/secondthousand/_1281Test.java
index 1a8de3f4d9..735a1f931b 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1281Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1281Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1281;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1281Test {
-    private static _1281.Solution1 solution1;
+    private _1281.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1281.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1282Test.java b/src/test/java/com/fishercoder/secondthousand/_1282Test.java
index 22dfd14d3e..7134ab30fb 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1282Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1282Test.java
@@ -2,15 +2,15 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.secondthousand._1282;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _1282Test {
-    private static _1282.Solution1 solution1;
+    private _1282.Solution1 solution1;
     private static int[] groupSizes;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1282.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1283Test.java b/src/test/java/com/fishercoder/secondthousand/_1283Test.java
index 8672dc12ab..45044c421f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1283Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1283Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1283;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1283Test {
-    private static _1283.Solution solution;
+    private _1283.Solution solution;
     private static int[] nums;
     private static int threshold;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution = new _1283.Solution();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1286Test.java b/src/test/java/com/fishercoder/secondthousand/_1286Test.java
index abc2a4a9ca..7a8749c3ff 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1286Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1286Test.java
@@ -1,12 +1,12 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1286;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1286Test {
-    private static _1286.Solution1.CombinationIterator combinationIterator;
+    private _1286.Solution1.CombinationIterator combinationIterator;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1287Test.java b/src/test/java/com/fishercoder/secondthousand/_1287Test.java
index 6de564f60b..617be47917 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1287Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1287Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1287;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1287Test {
-    private static _1287.Solution1 solution1;
+    private _1287.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1287.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1289Test.java b/src/test/java/com/fishercoder/secondthousand/_1289Test.java
index 41cb606d32..8e3817c288 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1289Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1289Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1289;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1289Test {
-    private static _1289.Solution1 solution1;
+    private _1289.Solution1 solution1;
     private static int[][] arr;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1289.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1290Test.java b/src/test/java/com/fishercoder/secondthousand/_1290Test.java
index e3db681610..9c4ddce583 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1290Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1290Test.java
@@ -3,20 +3,20 @@
 import com.fishercoder.common.classes.ListNode;
 import com.fishercoder.common.utils.LinkedListUtils;
 import com.fishercoder.solutions.secondthousand._1290;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1290Test {
-    private static _1290.Solution1 solution1;
-    private static _1290.Solution2 solution2;
+    private _1290.Solution1 solution1;
+    private _1290.Solution2 solution2;
     private static ListNode head;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1290.Solution1();
         solution2 = new _1290.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1291Test.java b/src/test/java/com/fishercoder/secondthousand/_1291Test.java
index c91fa31862..223d30fe2f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1291Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1291Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1291;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@Ignore
+@Disabled
 public class _1291Test {
-    private static _1291.Solution1 solution1;
+    private _1291.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1291.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1295Test.java b/src/test/java/com/fishercoder/secondthousand/_1295Test.java
index 04616261ba..ba2369d64f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1295Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1295Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1295;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1295Test {
-    private static _1295.Solution1 solution1;
-    private static _1295.Solution2 solution2;
+    private _1295.Solution1 solution1;
+    private _1295.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1295.Solution1();
         solution2 = new _1295.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1296Test.java b/src/test/java/com/fishercoder/secondthousand/_1296Test.java
index bf0f61c77d..706de2fb16 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1296Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1296Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1296;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1296Test {
-    private static _1296.Solution1 solution1;
+    private _1296.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1296.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1297Test.java b/src/test/java/com/fishercoder/secondthousand/_1297Test.java
index 2f683fa434..662d311ec5 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1297Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1297Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1297;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1297Test {
-    private static _1297.Solution1 solution1;
+    private _1297.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1297.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1299Test.java b/src/test/java/com/fishercoder/secondthousand/_1299Test.java
index 529869b75d..9f300b9261 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1299Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1299Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1299;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1299Test {
-    private static _1299.Solution1 solution1;
+    private _1299.Solution1 solution1;
     private static int[] arr;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1299.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1300Test.java b/src/test/java/com/fishercoder/secondthousand/_1300Test.java
index 8bf704ff8f..b8fd60e6b1 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1300Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1300Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1300;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1300Test {
-    private static _1300.Solution1 solution1;
+    private _1300.Solution1 solution1;
     private static int[] arr;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1300.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1302Test.java b/src/test/java/com/fishercoder/secondthousand/_1302Test.java
index 9171789bc6..08bb83b470 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1302Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1302Test.java
@@ -2,18 +2,18 @@
 
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1302;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1302Test {
-    private static _1302.Solution1 solution1;
+    private _1302.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1302.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1304Test.java b/src/test/java/com/fishercoder/secondthousand/_1304Test.java
index 508914f75d..d9f4c235f2 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1304Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1304Test.java
@@ -2,14 +2,14 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.secondthousand._1304;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _1304Test {
-    private static _1304.Solution1 solution1;
+    private _1304.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1304.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1305Test.java b/src/test/java/com/fishercoder/secondthousand/_1305Test.java
index 0c8be8c7c3..df86d05209 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1305Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1305Test.java
@@ -3,20 +3,20 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1305;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1305Test {
-    private static _1305.Solution1 solution1;
+    private _1305.Solution1 solution1;
     private static TreeNode root1;
     private static TreeNode root2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1305.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1309Test.java b/src/test/java/com/fishercoder/secondthousand/_1309Test.java
index 44c26653c2..cb826770db 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1309Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1309Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1309;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1309Test {
-    private static _1309.Solution1 solution1;
+    private _1309.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1309.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1313Test.java b/src/test/java/com/fishercoder/secondthousand/_1313Test.java
index 38b6fd08f8..f1a585559a 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1313Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1313Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1313;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1313Test {
-    private static _1313.Solution1 solution1;
+    private _1313.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1313.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1314Test.java b/src/test/java/com/fishercoder/secondthousand/_1314Test.java
index 552378eb62..8aee1b4066 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1314Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1314Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1314Test {
-    private static _1314.Solution1 solution1;
-    private static _1314.Solution2 solution2;
+    private _1314.Solution1 solution1;
+    private _1314.Solution2 solution2;
     private static int[][] mat;
     private static int[][] expected;
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1315Test.java b/src/test/java/com/fishercoder/secondthousand/_1315Test.java
index 9b0c03eb30..6d492ba6da 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1315Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1315Test.java
@@ -3,19 +3,19 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1315;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1315Test {
-    private static _1315.Solution1 solution1;
+    private _1315.Solution1 solution1;
     private static TreeNode root;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1315.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1317Test.java b/src/test/java/com/fishercoder/secondthousand/_1317Test.java
index b772155f9e..7e836d80ad 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1317Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1317Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1317;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1317Test {
-    private static _1317.Solution1 solution1;
+    private _1317.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1317.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1323Test.java b/src/test/java/com/fishercoder/secondthousand/_1323Test.java
index 76f179e7f8..e3a9a17c16 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1323Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1323Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1323;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1323Test {
-    private static _1323.Solution1 solution1;
+    private _1323.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1323.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1324Test.java b/src/test/java/com/fishercoder/secondthousand/_1324Test.java
index 76cc4059fb..0329e0ede6 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1324Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1324Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1324;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1324Test {
-    private static _1324.Solution1 solution1;
+    private _1324.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1324.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1325Test.java b/src/test/java/com/fishercoder/secondthousand/_1325Test.java
index c88fd5e049..d21f474d39 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1325Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1325Test.java
@@ -3,21 +3,21 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1325;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1325Test {
-    private static _1325.Solution1 solution1;
-    private static _1325.Solution2 solution2;
+    private _1325.Solution1 solution1;
+    private _1325.Solution2 solution2;
     private static TreeNode root;
     private static TreeNode expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1325.Solution1();
         solution2 = new _1325.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1331Test.java b/src/test/java/com/fishercoder/secondthousand/_1331Test.java
index 2a1f2fb17d..0956b9edf8 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1331Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1331Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1331;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1331Test {
-    private static _1331.Solution1 solution1;
+    private _1331.Solution1 solution1;
     private static int[] arr;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1331.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1333Test.java b/src/test/java/com/fishercoder/secondthousand/_1333Test.java
index d354027b9b..2ddd4b8b38 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1333Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1333Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1333;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1333Test {
-    private static _1333.Solution1 solution1;
+    private _1333.Solution1 solution1;
     private static int[][] restaurants;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1333.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1334Test.java b/src/test/java/com/fishercoder/secondthousand/_1334Test.java
index 492b898232..0deea387ed 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1334Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1334Test.java
@@ -9,7 +9,7 @@
 
 
 public class _1334Test {
-    private static _1334.Solution1 solution1;
+    private _1334.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1337Test.java b/src/test/java/com/fishercoder/secondthousand/_1337Test.java
index 1bc4c12f21..843c7add39 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1337Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1337Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1337;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1337Test {
-    private static _1337.Solution1 solution1;
+    private _1337.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1337.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1338Test.java b/src/test/java/com/fishercoder/secondthousand/_1338Test.java
index 9f6fffb16d..ffc33194a1 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1338Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1338Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1338;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1338Test {
-    private static _1338.Solution1 solution1;
+    private _1338.Solution1 solution1;
     private static int[] arr;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1338.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1339Test.java b/src/test/java/com/fishercoder/secondthousand/_1339Test.java
index 5c653a2a13..368aebbac6 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1339Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1339Test.java
@@ -11,8 +11,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1339Test {
-    private static _1339.Solution1 solution1;
-    private static _1339.Solution2 solution2;
+    private _1339.Solution1 solution1;
+    private _1339.Solution2 solution2;
     private static TreeNode root;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/secondthousand/_1341Test.java b/src/test/java/com/fishercoder/secondthousand/_1341Test.java
index ad924df2ab..90ebd04b78 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1341Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1341Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1341;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1341Test {
-    private static _1341.Solution1 solution1;
+    private _1341.Solution1 solution1;
     private static int[][] mat;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1341.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1342Test.java b/src/test/java/com/fishercoder/secondthousand/_1342Test.java
index d4713a15a0..872fe23334 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1342Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1342Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1342;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1342Test {
-    private static _1342.Solution1 solution1;
+    private _1342.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1342.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1343Test.java b/src/test/java/com/fishercoder/secondthousand/_1343Test.java
index 78d8517dd5..e74fef4996 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1343Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1343Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1343;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1343Test {
-    private static _1343.Solution1 solution1;
+    private _1343.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1343.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1344Test.java b/src/test/java/com/fishercoder/secondthousand/_1344Test.java
index 6be19b17f2..e2c1a87136 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1344Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1344Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1344;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1344Test {
-    private static _1344.Solution1 solution1;
+    private _1344.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1344.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1345Test.java b/src/test/java/com/fishercoder/secondthousand/_1345Test.java
index d9c3f904de..b83fc09b40 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1345Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1345Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1345;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1345Test {
-    private static _1345.Solution1 solution1;
+    private _1345.Solution1 solution1;
     private static int[] arr;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1345.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1346Test.java b/src/test/java/com/fishercoder/secondthousand/_1346Test.java
index 01fb371f21..93f63a47a1 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1346Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1346Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1346;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1346Test {
-    private static _1346.Solution1 solution1;
+    private _1346.Solution1 solution1;
     private static int[] arr;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1346.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1347Test.java b/src/test/java/com/fishercoder/secondthousand/_1347Test.java
index 3f2b2d9d6a..3b66036c49 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1347Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1347Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1347;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1347Test {
-    private static _1347.Solution1 solution1;
+    private _1347.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1347.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1348Test.java b/src/test/java/com/fishercoder/secondthousand/_1348Test.java
index f68b4c14cf..c9af7d2bc3 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1348Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1348Test.java
@@ -1,14 +1,14 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1348;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1348Test {
-    private static _1348.Solution1.TweetCounts tweetCounts;
+    private _1348.Solution1.TweetCounts tweetCounts;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1349Test.java b/src/test/java/com/fishercoder/secondthousand/_1349Test.java
index af4796b587..3c16c5db6a 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1349Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1349Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1349;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1349Test {
-    private static _1349.Solution1 solution1;
+    private _1349.Solution1 solution1;
     private static char[][] seats;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1349.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1352Test.java b/src/test/java/com/fishercoder/secondthousand/_1352Test.java
index 742974bce5..3db0f766ab 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1352Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1352Test.java
@@ -1,12 +1,12 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1352;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1352Test {
-    private static _1352.Solution1.ProductOfNumbers productOfNumbers;
+    private _1352.Solution1.ProductOfNumbers productOfNumbers;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1353Test.java b/src/test/java/com/fishercoder/secondthousand/_1353Test.java
index 8ff5ad2998..ff28439edf 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1353Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1353Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1353;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1353Test {
-    private static _1353.Solution1 solution1;
+    private _1353.Solution1 solution1;
     private static int[][] events;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1353.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1354Test.java b/src/test/java/com/fishercoder/secondthousand/_1354Test.java
index 32e4761d2a..984d6e9812 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1354Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1354Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1354;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1354Test {
-    private static _1354.Solution1 solution1;
+    private _1354.Solution1 solution1;
     private static int[] target;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1354.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1356Test.java b/src/test/java/com/fishercoder/secondthousand/_1356Test.java
index 90782f4ca6..1d2bf6fd38 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1356Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1356Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1356;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1356Test {
-    private static _1356.Solution1 solution1;
+    private _1356.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1356.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1357Test.java b/src/test/java/com/fishercoder/secondthousand/_1357Test.java
index ec5d495812..3ba69d344f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1357Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1357Test.java
@@ -1,12 +1,12 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1357;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1357Test {
-    private static _1357.Solution1.Cashier cashier;
+    private _1357.Solution1.Cashier cashier;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1358Test.java b/src/test/java/com/fishercoder/secondthousand/_1358Test.java
index 9fc5d5e313..961fce80d8 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1358Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1358Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1358;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1358Test {
-    private static _1358.Solution1 solution1;
+    private _1358.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1358.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1360Test.java b/src/test/java/com/fishercoder/secondthousand/_1360Test.java
index 092fd2c732..5199fd5b39 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1360Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1360Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1360;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1360Test {
-    private static _1360.Solution1 solution1;
+    private _1360.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1360.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1361Test.java b/src/test/java/com/fishercoder/secondthousand/_1361Test.java
index 2ab58af7d7..3156c3f019 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1361Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1361Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1361;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1361Test {
-    private static _1361.Solution1 solution1;
+    private _1361.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1361.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1362Test.java b/src/test/java/com/fishercoder/secondthousand/_1362Test.java
index 7ed760b90b..c249fdffd4 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1362Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1362Test.java
@@ -2,16 +2,16 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.secondthousand._1362;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1362Test {
-    private static _1362.Solution1 solution1;
+    private _1362.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1362.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1365Test.java b/src/test/java/com/fishercoder/secondthousand/_1365Test.java
index a7ea352437..f4a0ab2ba9 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1365Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1365Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1365;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1365Test {
-    private static _1365.Solution1 solution1;
+    private _1365.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1365.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1366Test.java b/src/test/java/com/fishercoder/secondthousand/_1366Test.java
index 38982bae7c..b1972b4ce6 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1366Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1366Test.java
@@ -1,12 +1,12 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1366;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1366Test {
-    private static _1366.Solution1 solution1;
+    private _1366.Solution1 solution1;
     private static String[] votes;
 
     @Test
diff --git a/src/test/java/com/fishercoder/secondthousand/_1367Test.java b/src/test/java/com/fishercoder/secondthousand/_1367Test.java
index 91254ada18..8129695953 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1367Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1367Test.java
@@ -5,14 +5,14 @@
 import com.fishercoder.common.utils.LinkedListUtils;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1367;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1367Test {
-    private static _1367.Solution1 solution1;
+    private _1367.Solution1 solution1;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1370Test.java b/src/test/java/com/fishercoder/secondthousand/_1370Test.java
index 9ea5b7466d..b3b6ae7d91 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1370Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1370Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1370;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1370Test {
-    private static _1370.Solution1 solution1;
+    private _1370.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1370.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1371Test.java b/src/test/java/com/fishercoder/secondthousand/_1371Test.java
index a2c01aef25..c1ccf29055 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1371Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1371Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1371;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1371Test {
-    private static _1371.Solution1 solution1;
+    private _1371.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1371.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1372Test.java b/src/test/java/com/fishercoder/secondthousand/_1372Test.java
index ef0b2c90bf..29439eb534 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1372Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1372Test.java
@@ -3,14 +3,14 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1372;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1372Test {
-    private static _1372.Solution1 solution1;
+    private _1372.Solution1 solution1;
     private static TreeNode root;
 
     @Test
diff --git a/src/test/java/com/fishercoder/secondthousand/_1373Test.java b/src/test/java/com/fishercoder/secondthousand/_1373Test.java
index 37601a9cc0..e13a06d5cb 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1373Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1373Test.java
@@ -3,14 +3,14 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1373;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1373Test {
-    private static _1373.Solution1 solution1;
+    private _1373.Solution1 solution1;
     private static TreeNode root;
 
     @Test
diff --git a/src/test/java/com/fishercoder/secondthousand/_1374Test.java b/src/test/java/com/fishercoder/secondthousand/_1374Test.java
index 37a0788d41..8d1c848b03 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1374Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1374Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1374;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1374Test {
-    private static _1374.Solution1 solution1;
+    private _1374.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1374.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1375Test.java b/src/test/java/com/fishercoder/secondthousand/_1375Test.java
index 62a893bbf5..6a0711d7f5 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1375Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1375Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1375;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1375Test {
-    private static _1375.Solution1 solution1;
+    private _1375.Solution1 solution1;
     private static int[] light;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1375.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1376Test.java b/src/test/java/com/fishercoder/secondthousand/_1376Test.java
index 44448b42c7..4ff35a69b2 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1376Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1376Test.java
@@ -1,12 +1,12 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1376;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1376Test {
-    private static _1376.Solution1 solution1;
+    private _1376.Solution1 solution1;
     private static int[] manager;
     private static int[] informTime;
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1377Test.java b/src/test/java/com/fishercoder/secondthousand/_1377Test.java
index 5afc99727c..bb96e6702b 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1377Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1377Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1377;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1377Test {
-    private static _1377.Solution1 solution1;
+    private _1377.Solution1 solution1;
     private static int[][] edges;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1377.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1379Test.java b/src/test/java/com/fishercoder/secondthousand/_1379Test.java
index 20409f2534..66115546a9 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1379Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1379Test.java
@@ -3,20 +3,20 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1379;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
 public class _1379Test {
-    private static _1379.Solution1 solution1;
-    private static _1379.Solution2 solution2;
+    private _1379.Solution1 solution1;
+    private _1379.Solution2 solution2;
     private static TreeNode original;
     private static TreeNode cloned;
     private static TreeNode target;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1379.Solution1();
         solution2 = new _1379.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1380Test.java b/src/test/java/com/fishercoder/secondthousand/_1380Test.java
index e87dc75ac4..5c32dd1e61 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1380Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1380Test.java
@@ -10,8 +10,8 @@
 
 
 public class _1380Test {
-    private static _1380.Solution1 solution1;
-    private static _1380.Solution2 solution2;
+    private _1380.Solution1 solution1;
+    private _1380.Solution2 solution2;
     private static int[][] matrix;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/secondthousand/_1381Test.java b/src/test/java/com/fishercoder/secondthousand/_1381Test.java
index 30c4217713..ef65f94d92 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1381Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1381Test.java
@@ -1,13 +1,13 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1381;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1381Test {
-    private static _1381.Solution1.CustomStack customStack;
-    private static _1381.Solution2.CustomStack customStack2;
+    private _1381.Solution1.CustomStack customStack;
+    private _1381.Solution2.CustomStack customStack2;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1382Test.java b/src/test/java/com/fishercoder/secondthousand/_1382Test.java
index d65f4bf1ef..75f8dbfe15 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1382Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1382Test.java
@@ -3,16 +3,16 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1382;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
 public class _1382Test {
-    private static _1382.Solution1 solution1;
+    private _1382.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1382.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1385Test.java b/src/test/java/com/fishercoder/secondthousand/_1385Test.java
index e6f1cd0d91..0ef4d248dc 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1385Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1385Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1385;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1385Test {
-    private static _1385.Solution1 solution1;
+    private _1385.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1385.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1386Test.java b/src/test/java/com/fishercoder/secondthousand/_1386Test.java
index 665d703d2b..745619104d 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1386Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1386Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1386;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1386Test {
-    private static _1386.Solution1 solution1;
+    private _1386.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1386.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1387Test.java b/src/test/java/com/fishercoder/secondthousand/_1387Test.java
index 8731f80691..23a0000f09 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1387Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1387Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1387;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1387Test {
-    private static _1387.Solution1 solution1;
+    private _1387.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1387.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1388Test.java b/src/test/java/com/fishercoder/secondthousand/_1388Test.java
index f7ce31e9e0..35bc0e916f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1388Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1388Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1388;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1388Test {
-    private static _1388.Solution1 solution1;
+    private _1388.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1388.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1389Test.java b/src/test/java/com/fishercoder/secondthousand/_1389Test.java
index cb104e8ba2..2996bb330b 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1389Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1389Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1389;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1389Test {
-    private static _1389.Solution1 solution1;
+    private _1389.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1389.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1390Test.java b/src/test/java/com/fishercoder/secondthousand/_1390Test.java
index 127441c811..90caefccbe 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1390Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1390Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1390;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1390Test {
-    private static _1390.Solution1 solution1;
+    private _1390.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1390.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1392Test.java b/src/test/java/com/fishercoder/secondthousand/_1392Test.java
index 33927dad94..46018de88e 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1392Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1392Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1392;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1392Test {
 
-    private static _1392.Solution1 solution1;
+    private _1392.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1392.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1394Test.java b/src/test/java/com/fishercoder/secondthousand/_1394Test.java
index e7e9002375..ba43433c7d 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1394Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1394Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1394;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1394Test {
 
-    private static _1394.Solution1 solution1;
+    private _1394.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1394.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1395Test.java b/src/test/java/com/fishercoder/secondthousand/_1395Test.java
index 67580cb646..59e433fe98 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1395Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1395Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1395Test {
-    private static _1395.Solution1 solution1;
+    private _1395.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1399Test.java b/src/test/java/com/fishercoder/secondthousand/_1399Test.java
index 42b7d2ae34..bd99b7a777 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1399Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1399Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1399;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1399Test {
-    private static _1399.Solution1 solution1;
+    private _1399.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1399.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1400Test.java b/src/test/java/com/fishercoder/secondthousand/_1400Test.java
index d86815d8c0..e0f0b2b750 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1400Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1400Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1400;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1400Test {
-    private static _1400.Solution1 solution1;
+    private _1400.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1400.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1401Test.java b/src/test/java/com/fishercoder/secondthousand/_1401Test.java
index 8a710ee094..e72c4a55ec 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1401Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1401Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1401;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1401Test {
-    private static _1401.Solution1 solution1;
+    private _1401.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1401.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1403Test.java b/src/test/java/com/fishercoder/secondthousand/_1403Test.java
index b4ac4e5c83..d971b77376 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1403Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1403Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1403;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1403Test {
-    private static _1403.Solution1 solution1;
+    private _1403.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1403.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1405Test.java b/src/test/java/com/fishercoder/secondthousand/_1405Test.java
index 99c9ea9424..37cfe3dabf 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1405Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1405Test.java
@@ -5,7 +5,7 @@
 import org.junit.jupiter.api.Test;
 
 public class _1405Test {
-    private static _1405.Solution1 solution1;
+    private _1405.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1408Test.java b/src/test/java/com/fishercoder/secondthousand/_1408Test.java
index 015c9d3969..9f9c73a514 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1408Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1408Test.java
@@ -1,22 +1,22 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1408;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1408Test {
-    private static _1408.Solution1 solution1;
+    private _1408.Solution1 solution1;
     private static String[] words;
     private static List<String> expected;
     private static List<String> actual;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1408.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1409Test.java b/src/test/java/com/fishercoder/secondthousand/_1409Test.java
index 5d7ce1b3c1..6212b90172 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1409Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1409Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1409;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1409Test {
-    private static _1409.Solution1 solution1;
+    private _1409.Solution1 solution1;
     private static int[] queries;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1409.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1410Test.java b/src/test/java/com/fishercoder/secondthousand/_1410Test.java
index 3e72cafe5a..f40f2c97c8 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1410Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1410Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1410;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1410Test {
-    private static _1410.Solution1 solution1;
+    private _1410.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1410.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1413Test.java b/src/test/java/com/fishercoder/secondthousand/_1413Test.java
index 7f75cb02bf..25a5a0e8a3 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1413Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1413Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1413;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1413Test {
-    private static _1413.Solution1 solution1;
+    private _1413.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1413.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1414Test.java b/src/test/java/com/fishercoder/secondthousand/_1414Test.java
index cb7d29f290..55918fbfbf 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1414Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1414Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1414Test {
-    private static _1414.Solution1 solution1;
+    private _1414.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1415Test.java b/src/test/java/com/fishercoder/secondthousand/_1415Test.java
index 6e8672432f..2898b04c3f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1415Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1415Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1415;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1415Test {
 
-    private static _1415.Solution1 solution1;
+    private _1415.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1415.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1417Test.java b/src/test/java/com/fishercoder/secondthousand/_1417Test.java
index 1329748a6f..39da21c693 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1417Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1417Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1417;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1417Test {
-    private static _1417.Solution1 solution1;
+    private _1417.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1417.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1418Test.java b/src/test/java/com/fishercoder/secondthousand/_1418Test.java
index 2a9316c9ab..6b19cf9aa4 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1418Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1418Test.java
@@ -1,21 +1,21 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1418;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1418Test {
-    private static _1418.Solution1 solution1;
+    private _1418.Solution1 solution1;
     private static List<List<String>> orders;
     private static List<List<String>> expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1418.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1422Test.java b/src/test/java/com/fishercoder/secondthousand/_1422Test.java
index be0ce73c16..bff3252cb3 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1422Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1422Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1422;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1422Test {
-    private static _1422.Solution1 solution1;
+    private _1422.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1422.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1423Test.java b/src/test/java/com/fishercoder/secondthousand/_1423Test.java
index 04c3a90ec9..e2d73dc0ab 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1423Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1423Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1423;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1423Test {
-    private static _1423.Solution1 solution1;
-    private static _1423.Solution2 solution2;
+    private _1423.Solution1 solution1;
+    private _1423.Solution2 solution2;
     private static int[] cardPoints;
     private static int expected;
     private static int k;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1423.Solution1();
         solution2 = new _1423.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1424Test.java b/src/test/java/com/fishercoder/secondthousand/_1424Test.java
index b60ac8819c..b72b8c684c 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1424Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1424Test.java
@@ -9,7 +9,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1424Test {
-    private static _1424.Solution1 solution1;
+    private _1424.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1426Test.java b/src/test/java/com/fishercoder/secondthousand/_1426Test.java
index d0a66c03f3..4e148e55d5 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1426Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1426Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1426;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1426Test {
-    private static _1426.Solution1 solution1;
+    private _1426.Solution1 solution1;
     private static int[] arr;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1426.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1427Test.java b/src/test/java/com/fishercoder/secondthousand/_1427Test.java
index ce3072d539..3cf5c6cd6d 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1427Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1427Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1427;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1427Test {
-    private static _1427.Solution1 solution1;
+    private _1427.Solution1 solution1;
     private static int[][] shift;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1427.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1428Test.java b/src/test/java/com/fishercoder/secondthousand/_1428Test.java
index 55fb94b85f..8270bd667f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1428Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1428Test.java
@@ -3,17 +3,17 @@
 import com.fishercoder.common.classes.BinaryMatrix;
 import com.fishercoder.common.classes.BinaryMatrixImpl;
 import com.fishercoder.solutions.secondthousand._1428;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1428Test {
-    private static _1428.Solution1 solution1;
+    private _1428.Solution1 solution1;
     private static BinaryMatrix binaryMatrix;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1428.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1431Test.java b/src/test/java/com/fishercoder/secondthousand/_1431Test.java
index a13dbb7a6c..22eaef0d6d 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1431Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1431Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1431;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1431Test {
-    private static _1431.Solution1 solution1;
+    private _1431.Solution1 solution1;
     private static int[] candies;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1431.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1432Test.java b/src/test/java/com/fishercoder/secondthousand/_1432Test.java
index be6872b07b..220e458425 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1432Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1432Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1432;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1432Test {
-    private static _1432.Solution1 solution1;
+    private _1432.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1432.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1436Test.java b/src/test/java/com/fishercoder/secondthousand/_1436Test.java
index 64f963701b..108bc8cdb8 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1436Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1436Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1436;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1436Test {
-    private static _1436.Solution1 solution1;
+    private _1436.Solution1 solution1;
     private static List<List<String>> paths;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1436.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1437Test.java b/src/test/java/com/fishercoder/secondthousand/_1437Test.java
index 994a6415f0..cb4c16e0fe 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1437Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1437Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1437;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1437Test {
-    private static _1437.Solution1 solution1;
+    private _1437.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1437.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1438Test.java b/src/test/java/com/fishercoder/secondthousand/_1438Test.java
index 237924fe29..0fe4af5957 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1438Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1438Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1438;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1438Test {
-    private static _1438.Solution1 solution1;
+    private _1438.Solution1 solution1;
     private static int[] nums;
     private static int limit;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1438.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1439Test.java b/src/test/java/com/fishercoder/secondthousand/_1439Test.java
index 45b41bbc6c..56ea739440 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1439Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1439Test.java
@@ -2,19 +2,19 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.secondthousand._1439;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1439Test {
-    private static _1439.Solution1 solution1;
+    private _1439.Solution1 solution1;
     private static int[][] mat;
     private static int expected;
     private static int k;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1439.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1441Test.java b/src/test/java/com/fishercoder/secondthousand/_1441Test.java
index a1d74c778a..ea83e2389b 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1441Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1441Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1441;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1441Test {
-    private static _1441.Solution1 solution1;
+    private _1441.Solution1 solution1;
     private static int[] target;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1441.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1446Test.java b/src/test/java/com/fishercoder/secondthousand/_1446Test.java
index 72dd66d070..78cabcf4eb 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1446Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1446Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1446;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1446Test {
-    private static _1446.Solution1 solution1;
+    private _1446.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1446.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1447Test.java b/src/test/java/com/fishercoder/secondthousand/_1447Test.java
index ac17f96afa..e0fda03eb8 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1447Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1447Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1447;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1447Test {
-    private static _1447.Solution1 solution1;
+    private _1447.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1447.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1448Test.java b/src/test/java/com/fishercoder/secondthousand/_1448Test.java
index cc3a3f6d9b..d6d13ad53e 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1448Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1448Test.java
@@ -3,14 +3,14 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1448;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1448Test {
-    private static _1448.Solution1 solution1;
+    private _1448.Solution1 solution1;
     private static TreeNode root;
 
     @Test
diff --git a/src/test/java/com/fishercoder/secondthousand/_1450Test.java b/src/test/java/com/fishercoder/secondthousand/_1450Test.java
index 78b6d858ae..8f9fd9dbd2 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1450Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1450Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1450;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1450Test {
-    private static _1450.Solution1 solution1;
+    private _1450.Solution1 solution1;
     private static int[] startTime;
     private static int[] endTime;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1450.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1451Test.java b/src/test/java/com/fishercoder/secondthousand/_1451Test.java
index 61e146cc27..d55ff85236 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1451Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1451Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1451;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1451Test {
-    private static _1451.Solution1 solution1;
+    private _1451.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1451.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1452Test.java b/src/test/java/com/fishercoder/secondthousand/_1452Test.java
index cc50847327..51e54fbbbc 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1452Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1452Test.java
@@ -1,21 +1,21 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1452;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1452Test {
-    private static _1452.Solution1 solution1;
+    private _1452.Solution1 solution1;
     private static List<List<String>> favoriteCompanies;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1452.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1455Test.java b/src/test/java/com/fishercoder/secondthousand/_1455Test.java
index 783a4a402f..4a16c688a6 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1455Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1455Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1455;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1455Test {
-    private static _1455.Solution1 solution1;
+    private _1455.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1455.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1456Test.java b/src/test/java/com/fishercoder/secondthousand/_1456Test.java
index 5216dd120e..a6d10737ed 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1456Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1456Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1456;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1456Test {
-    private static _1456.Solution1 solution1;
+    private _1456.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1456.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1457Test.java b/src/test/java/com/fishercoder/secondthousand/_1457Test.java
index 9c37f64185..31e2cf2b6b 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1457Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1457Test.java
@@ -3,18 +3,18 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1457;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1457Test {
-    private static _1457.Solution1 solution1;
+    private _1457.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1457.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1460Test.java b/src/test/java/com/fishercoder/secondthousand/_1460Test.java
index b9798eb03f..c1bef57645 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1460Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1460Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1460Test {
-    private static _1460.Solution1 solution1;
+    private _1460.Solution1 solution1;
     private static int[] target;
     private static int[] arr;
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1461Test.java b/src/test/java/com/fishercoder/secondthousand/_1461Test.java
index 3b7cff9972..3912ffd5f0 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1461Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1461Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1461;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1461Test {
-    private static _1461.Solution1 solution1;
+    private _1461.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1461.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1462Test.java b/src/test/java/com/fishercoder/secondthousand/_1462Test.java
index 5c9ca65acc..0a0bb10192 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1462Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1462Test.java
@@ -10,7 +10,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1462Test {
-    private static _1462.Solution1 solution1;
+    private _1462.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1464Test.java b/src/test/java/com/fishercoder/secondthousand/_1464Test.java
index d5eecc9e5d..5ae409707e 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1464Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1464Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1464;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1464Test {
-    private static _1464.Solution1 solution1;
+    private _1464.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1464.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1466Test.java b/src/test/java/com/fishercoder/secondthousand/_1466Test.java
index 5906c71292..95e220cb5f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1466Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1466Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1466Test {
-    private static _1466.Solution1 solution1;
-    private static _1466.Solution2 solution2;
+    private _1466.Solution1 solution1;
+    private _1466.Solution2 solution2;
     private static int[][] connections;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/secondthousand/_1469Test.java b/src/test/java/com/fishercoder/secondthousand/_1469Test.java
index aa6bbd78eb..f13e852953 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1469Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1469Test.java
@@ -2,18 +2,18 @@
 
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1469;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1469Test {
-    private static _1469.Solution1 solution1;
+    private _1469.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1469.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1470Test.java b/src/test/java/com/fishercoder/secondthousand/_1470Test.java
index 5b37df7afa..79a97d5157 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1470Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1470Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1470;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1470Test {
-    private static _1470.Solution1 solution1;
+    private _1470.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1470.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1471Test.java b/src/test/java/com/fishercoder/secondthousand/_1471Test.java
index 326aa32c4f..f7ae39abc4 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1471Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1471Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1471;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1471Test {
-    private static _1471.Solution1 solution1;
+    private _1471.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1471.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1472Test.java b/src/test/java/com/fishercoder/secondthousand/_1472Test.java
index 348c18c73a..194b334da3 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1472Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1472Test.java
@@ -1,12 +1,12 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1472;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1472Test {
-    private static _1472.Solution1.BrowserHistory browserHistory;
+    private _1472.Solution1.BrowserHistory browserHistory;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1474Test.java b/src/test/java/com/fishercoder/secondthousand/_1474Test.java
index 7ebe7a6750..ba56285d98 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1474Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1474Test.java
@@ -3,17 +3,17 @@
 import com.fishercoder.common.classes.ListNode;
 import com.fishercoder.common.utils.LinkedListUtils;
 import com.fishercoder.solutions.secondthousand._1474;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1474Test {
-    private static _1474.Solution1 solution1;
+    private _1474.Solution1 solution1;
     private static ListNode head;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1474.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1475Test.java b/src/test/java/com/fishercoder/secondthousand/_1475Test.java
index 20fb6f0f86..33bbbfb589 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1475Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1475Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1475;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1475Test {
-    private static _1475.Solution1 solution1;
+    private _1475.Solution1 solution1;
     private static int[] prices;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1475.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1476Test.java b/src/test/java/com/fishercoder/secondthousand/_1476Test.java
index 273a41998f..9f27059847 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1476Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1476Test.java
@@ -1,12 +1,12 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1476;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1476Test {
-    private static _1476.Solution1.SubrectangleQueries solution1;
+    private _1476.Solution1.SubrectangleQueries solution1;
     private static int[][] rectangle;
 
     @Test
diff --git a/src/test/java/com/fishercoder/secondthousand/_1480Test.java b/src/test/java/com/fishercoder/secondthousand/_1480Test.java
index 1aa6606e8f..599f026fcf 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1480Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1480Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1480;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1480Test {
-    private static _1480.Solution1 solution1;
+    private _1480.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1480.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1481Test.java b/src/test/java/com/fishercoder/secondthousand/_1481Test.java
index de7ec721d2..42c9486807 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1481Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1481Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1481;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1481Test {
-    private static _1481.Solution1 solution1;
+    private _1481.Solution1 solution1;
     private static int[] arr;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1481.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1482Test.java b/src/test/java/com/fishercoder/secondthousand/_1482Test.java
index 84933a7415..d5e363c81d 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1482Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1482Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1482;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1482Test {
-    private static _1482.Solution1 solution1;
+    private _1482.Solution1 solution1;
     private static int expected;
     private static int[] bloomDay;
     private static int m;
     private static int k;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1482.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1485Test.java b/src/test/java/com/fishercoder/secondthousand/_1485Test.java
index 8647134732..06a2a2806f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1485Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1485Test.java
@@ -1,15 +1,15 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1485;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _1485Test {
 
-    private static _1485.Solution1 solution1;
+    private _1485.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1485.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1486Test.java b/src/test/java/com/fishercoder/secondthousand/_1486Test.java
index d8e1d42e12..ee81d7c20a 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1486Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1486Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1486;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1486Test {
-    private static _1486.Solution1 solution1;
+    private _1486.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1486.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1487Test.java b/src/test/java/com/fishercoder/secondthousand/_1487Test.java
index 553fc24789..d2eb83a7d1 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1487Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1487Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1487;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1487Test {
-    private static _1487.Solution1 solution1;
+    private _1487.Solution1 solution1;
     private static String[] names;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1487.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1490Test.java b/src/test/java/com/fishercoder/secondthousand/_1490Test.java
index abaa331043..f5f4a3d180 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1490Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1490Test.java
@@ -2,16 +2,16 @@
 
 import com.fishercoder.common.classes.Node;
 import com.fishercoder.solutions.secondthousand._1490;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1490Test {
-    private static _1490.Solution1 solution1;
+    private _1490.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1490.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1491Test.java b/src/test/java/com/fishercoder/secondthousand/_1491Test.java
index 06a2e79439..aedea7e95f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1491Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1491Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1491;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1491Test {
-    private static _1491.Solution1 solution1;
+    private _1491.Solution1 solution1;
     private static int[] salary;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1491.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1492Test.java b/src/test/java/com/fishercoder/secondthousand/_1492Test.java
index 462d6652c2..6b00bdf546 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1492Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1492Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1492;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1492Test {
-    private static _1492.Solution1 solution1;
+    private _1492.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1492.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1493Test.java b/src/test/java/com/fishercoder/secondthousand/_1493Test.java
index 228fdea1d6..a41da8c07d 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1493Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1493Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1493;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1493Test {
-    private static _1493.Solution1 solution1;
-    private static _1493.Solution2 solution2;
+    private _1493.Solution1 solution1;
+    private _1493.Solution2 solution2;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1493.Solution1();
         solution2 = new _1493.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1496Test.java b/src/test/java/com/fishercoder/secondthousand/_1496Test.java
index 1f79b49786..7a3810eba8 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1496Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1496Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1496;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1496Test {
-    private static _1496.Solution1 solution1;
+    private _1496.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1496.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1502Test.java b/src/test/java/com/fishercoder/secondthousand/_1502Test.java
index e6a7be08cf..757ac577f6 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1502Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1502Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1502;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1502Test {
-    private static _1502.Solution1 solution1;
+    private _1502.Solution1 solution1;
     private static int[] arr;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1502.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1507Test.java b/src/test/java/com/fishercoder/secondthousand/_1507Test.java
index c478f379ef..372d25e7a0 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1507Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1507Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1507;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1507Test {
-    private static _1507.Solution1 solution1;
+    private _1507.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1507.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1508Test.java b/src/test/java/com/fishercoder/secondthousand/_1508Test.java
index cfa2ae76df..70ea497413 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1508Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1508Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1508Test {
-    private static _1508.Solution1 solution1;
+    private _1508.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1509Test.java b/src/test/java/com/fishercoder/secondthousand/_1509Test.java
index 92a8554fbf..57ecd5bc65 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1509Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1509Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1509Test {
-    private static _1509.Solution1 solution1;
+    private _1509.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1512Test.java b/src/test/java/com/fishercoder/secondthousand/_1512Test.java
index 3603b9e8e0..cdda30460e 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1512Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1512Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1512;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1512Test {
-    private static _1512.Solution1 solution1;
+    private _1512.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1512.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1514Test.java b/src/test/java/com/fishercoder/secondthousand/_1514Test.java
index 54a0d1cb54..1cd40182e2 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1514Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1514Test.java
@@ -2,18 +2,18 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.secondthousand._1514;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1514Test {
-    private static _1514.Solution1 solution1;
+    private _1514.Solution1 solution1;
     private static int[][] edges;
     private static double[] succProb;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1514.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1518Test.java b/src/test/java/com/fishercoder/secondthousand/_1518Test.java
index e7048fcd98..82ef036223 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1518Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1518Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1518;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1518Test {
-    private static _1518.Solution1 solution1;
+    private _1518.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1518.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1523Test.java b/src/test/java/com/fishercoder/secondthousand/_1523Test.java
index c071800945..8a03df8825 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1523Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1523Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1523;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1523Test {
-    private static _1523.Solution1 solution1;
+    private _1523.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1523.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1524Test.java b/src/test/java/com/fishercoder/secondthousand/_1524Test.java
index 6dcfaee17d..de062dcd86 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1524Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1524Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1524;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1524Test {
-    private static _1524.Solution1 solution1;
-    private static _1524.Solution2 solution2;
+    private _1524.Solution1 solution1;
+    private _1524.Solution2 solution2;
     private static int[] arr;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1524.Solution1();
         solution2 = new _1524.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1525Test.java b/src/test/java/com/fishercoder/secondthousand/_1525Test.java
index c502f41bb7..81266c6dbf 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1525Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1525Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1525;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1525Test {
-    private static _1525.Solution1 solution1;
+    private _1525.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1525.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1526Test.java b/src/test/java/com/fishercoder/secondthousand/_1526Test.java
index e4200c7417..3657b443b2 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1526Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1526Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1526;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1526Test {
-    private static _1526.Solution1 solution1;
+    private _1526.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1526.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1528Test.java b/src/test/java/com/fishercoder/secondthousand/_1528Test.java
index 826b2cd479..a641ca563b 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1528Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1528Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1528;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1528Test {
-    private static _1528.Solution1 solution1;
+    private _1528.Solution1 solution1;
     private static int[] indices;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1528.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1530Test.java b/src/test/java/com/fishercoder/secondthousand/_1530Test.java
index 6119bd36e4..cef6305eb3 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1530Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1530Test.java
@@ -11,7 +11,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1530Test {
-    private static _1530.Solution1 solution1;
+    private _1530.Solution1 solution1;
     private static TreeNode root;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/secondthousand/_1534Test.java b/src/test/java/com/fishercoder/secondthousand/_1534Test.java
index 5139a77cfd..f42b00324e 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1534Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1534Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1534;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1534Test {
-    private static _1534.Solution1 solution1;
+    private _1534.Solution1 solution1;
     private static int[] arr;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1534.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1535Test.java b/src/test/java/com/fishercoder/secondthousand/_1535Test.java
index 7ab766094b..292b27c58a 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1535Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1535Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1535;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1535Test {
-    private static _1535.Solution1 solution1;
+    private _1535.Solution1 solution1;
     private static int[] arr;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1535.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1539Test.java b/src/test/java/com/fishercoder/secondthousand/_1539Test.java
index 26583a65d8..f5e60c5b8b 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1539Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1539Test.java
@@ -7,9 +7,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1539Test {
-    private static _1539.Solution1 solution1;
-    private static _1539.Solution2 solution2;
-    private static _1539.Solution3 solution3;
+    private _1539.Solution1 solution1;
+    private _1539.Solution2 solution2;
+    private _1539.Solution3 solution3;
     private static int[] arr;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/secondthousand/_1541Test.java b/src/test/java/com/fishercoder/secondthousand/_1541Test.java
index eafb2cc6ef..6fe923e675 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1541Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1541Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1541;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1541Test {
-    private static _1541.Solution1 solution1;
+    private _1541.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1541.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1544Test.java b/src/test/java/com/fishercoder/secondthousand/_1544Test.java
index 629f4bc1a8..16fa35d183 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1544Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1544Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1544;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1544Test {
-    private static _1544.Solution1 solution1;
+    private _1544.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1544.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1545Test.java b/src/test/java/com/fishercoder/secondthousand/_1545Test.java
index 0d2fd56f9c..0f8ef609ae 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1545Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1545Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1545;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1545Test {
-    private static _1545.Solution1 solution1;
+    private _1545.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1545.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1550Test.java b/src/test/java/com/fishercoder/secondthousand/_1550Test.java
index 2db5a66b9a..f1c6deb988 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1550Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1550Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1550;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1550Test {
-    private static _1550.Solution1 solution1;
+    private _1550.Solution1 solution1;
     private static int[] arr;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1550.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1551Test.java b/src/test/java/com/fishercoder/secondthousand/_1551Test.java
index fad7247a8b..3551b22977 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1551Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1551Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1551;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1551Test {
-    private static _1551.Solution1 solution1;
+    private _1551.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1551.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1556Test.java b/src/test/java/com/fishercoder/secondthousand/_1556Test.java
index c1135ab037..26102f5327 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1556Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1556Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1556;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1556Test {
-    private static _1556.Solution1 solution1;
+    private _1556.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1556.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1557Test.java b/src/test/java/com/fishercoder/secondthousand/_1557Test.java
index 43b9edcd79..993287e97d 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1557Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1557Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1557;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1557Test {
-    private static _1557.Solution1 solution1;
+    private _1557.Solution1 solution1;
     private static List<List<Integer>> edges;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1557.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1558Test.java b/src/test/java/com/fishercoder/secondthousand/_1558Test.java
index be1477e38c..3c46f21ef9 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1558Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1558Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1558;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1558Test {
-    private static _1558.Solution1 solution1;
+    private _1558.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1558.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1560Test.java b/src/test/java/com/fishercoder/secondthousand/_1560Test.java
index bb53946ad3..5d370584de 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1560Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1560Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1560;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1560Test {
-    private static _1560.Solution1 solution1;
+    private _1560.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1560.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1561Test.java b/src/test/java/com/fishercoder/secondthousand/_1561Test.java
index 4c4867d6dc..1b5fb9e95a 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1561Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1561Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1561;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1561Test {
-    private static _1561.Solution1 solution1;
+    private _1561.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1561.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1566Test.java b/src/test/java/com/fishercoder/secondthousand/_1566Test.java
index d0a439692f..5aa1d6d131 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1566Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1566Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1566;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1566Test {
-    private static _1566.Solution1 solution1;
+    private _1566.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1566.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1567Test.java b/src/test/java/com/fishercoder/secondthousand/_1567Test.java
index b2ecc0c7ba..0246a53527 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1567Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1567Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1567;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1567Test {
-    private static _1567.Solution1 solution1;
+    private _1567.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1567.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1572Test.java b/src/test/java/com/fishercoder/secondthousand/_1572Test.java
index 1f81907275..5923cc44c8 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1572Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1572Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1572;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1572Test {
-    private static _1572.Solution1 solution1;
+    private _1572.Solution1 solution1;
     private static int[][] mat;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1572.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1574Test.java b/src/test/java/com/fishercoder/secondthousand/_1574Test.java
index 687345c6b5..54b44e3fde 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1574Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1574Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1574;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1574Test {
-    private static _1574.Solution1 solution1;
+    private _1574.Solution1 solution1;
     private static int[] arr;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1574.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1576Test.java b/src/test/java/com/fishercoder/secondthousand/_1576Test.java
index e5d02420bc..f79e6ec5cc 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1576Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1576Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1576;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1576Test {
-    private static _1576.Solution1 solution1;
+    private _1576.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1576.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1577Test.java b/src/test/java/com/fishercoder/secondthousand/_1577Test.java
index a9322c3530..cdbb7e87c4 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1577Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1577Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1577;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1577Test {
-    private static _1577.Solution1 solution1;
+    private _1577.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1577.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1582Test.java b/src/test/java/com/fishercoder/secondthousand/_1582Test.java
index 6159ebd79d..28bb872769 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1582Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1582Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1582;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1582Test {
-    private static _1582.Solution1 solution1;
+    private _1582.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1582.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1583Test.java b/src/test/java/com/fishercoder/secondthousand/_1583Test.java
index 7dbf68c706..6a5882fac5 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1583Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1583Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1583;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1583Test {
-    private static _1583.Solution1 solution1;
+    private _1583.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1583.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1588Test.java b/src/test/java/com/fishercoder/secondthousand/_1588Test.java
index f9b33072e5..f3ab77cf40 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1588Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1588Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1588;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1588Test {
-    private static _1588.Solution1 solution1;
+    private _1588.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1588.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1592Test.java b/src/test/java/com/fishercoder/secondthousand/_1592Test.java
index 5d92164a9e..63775216de 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1592Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1592Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1592;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1592Test {
-    private static _1592.Solution1 solution1;
+    private _1592.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1592.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1600Test.java b/src/test/java/com/fishercoder/secondthousand/_1600Test.java
index b45c1e3fa5..20c24b0b64 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1600Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1600Test.java
@@ -8,7 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1600Test {
-    private static _1600.Solution1.ThroneInheritance throneInheritance;
+    private _1600.Solution1.ThroneInheritance throneInheritance;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1604Test.java b/src/test/java/com/fishercoder/secondthousand/_1604Test.java
index 07cbefe481..4207e084ae 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1604Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1604Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1604;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1604Test {
-    private static _1604.Solution1 solution1;
+    private _1604.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1604.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1605Test.java b/src/test/java/com/fishercoder/secondthousand/_1605Test.java
index 66e6390ef6..abef653dcf 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1605Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1605Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1605Test {
-    private static _1605.Solution1 solution1;
+    private _1605.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1625Test.java b/src/test/java/com/fishercoder/secondthousand/_1625Test.java
index 39b0ee6420..335321280e 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1625Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1625Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1625;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1625Test {
-    private static _1625.Solution1 solution1;
+    private _1625.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1625.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1626Test.java b/src/test/java/com/fishercoder/secondthousand/_1626Test.java
index bec7bd6de8..bf1ee7ed39 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1626Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1626Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1626;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1626Test {
-    private static _1626.Solution1 solution1;
+    private _1626.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1626.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1628Test.java b/src/test/java/com/fishercoder/secondthousand/_1628Test.java
index 8ee3eb59b0..4779242d0f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1628Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1628Test.java
@@ -2,19 +2,19 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.secondthousand._1628;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1628Test {
-    private static _1628.Solution1.TreeBuilder treeBuilderSolution1;
+    private _1628.Solution1.TreeBuilder treeBuilderSolution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         treeBuilderSolution1 = new _1628.Solution1.TreeBuilder();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1636Test.java b/src/test/java/com/fishercoder/secondthousand/_1636Test.java
index 1fd3f970e3..d25413ee64 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1636Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1636Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1636Test {
-    private static _1636.Solution1 solution1;
-    private static _1636.Solution2 solution2;
+    private _1636.Solution1 solution1;
+    private _1636.Solution2 solution2;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/secondthousand/_1640Test.java b/src/test/java/com/fishercoder/secondthousand/_1640Test.java
index 54ed23f150..0c627f36b8 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1640Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1640Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1640;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1640Test {
-    private static _1640.Solution1 solution1;
+    private _1640.Solution1 solution1;
     private static int[] arr;
     private static int[][] pieces;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1640.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1641Test.java b/src/test/java/com/fishercoder/secondthousand/_1641Test.java
index 8b16fca3cc..fd3ae1366c 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1641Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1641Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1641;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1641Test {
-    private static _1641.Solution1 solution1;
+    private _1641.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1641.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1642Test.java b/src/test/java/com/fishercoder/secondthousand/_1642Test.java
index 56db3c4189..f31d1934a3 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1642Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1642Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1642;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1642Test {
-    private static _1642.Solution1 solution1;
+    private _1642.Solution1 solution1;
 
-    @BeforeClass
-    public static void setUp() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1642.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1644Test.java b/src/test/java/com/fishercoder/secondthousand/_1644Test.java
index f6b95b0bb3..cd86553ab6 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1644Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1644Test.java
@@ -3,14 +3,14 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1644;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1644Test {
-    private static _1644.Solution1 solution1;
+    private _1644.Solution1 solution1;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1646Test.java b/src/test/java/com/fishercoder/secondthousand/_1646Test.java
index 08fbf483d9..555fed053b 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1646Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1646Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1646;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1646Test {
-    private static _1646.Solution1 solution1;
+    private _1646.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1646.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1652Test.java b/src/test/java/com/fishercoder/secondthousand/_1652Test.java
index 40d506fbd8..0154ada449 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1652Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1652Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1652;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1652Test {
-    private static _1652.Solution1 solution1;
+    private _1652.Solution1 solution1;
     private static int[] code;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1652.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1653Test.java b/src/test/java/com/fishercoder/secondthousand/_1653Test.java
index 7d12ddb060..0acc114a41 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1653Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1653Test.java
@@ -7,8 +7,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1653Test {
-    private static _1653.Solution1 solution1;
-    private static _1653.Solution2 solution2;
+    private _1653.Solution1 solution1;
+    private _1653.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1656Test.java b/src/test/java/com/fishercoder/secondthousand/_1656Test.java
index 3b3b9a5006..0511db86c6 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1656Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1656Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1656;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.Collections;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1656Test {
-    private static _1656.Solution1.OrderedStream orderedStream;
+    private _1656.Solution1.OrderedStream orderedStream;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1657Test.java b/src/test/java/com/fishercoder/secondthousand/_1657Test.java
index 581e8e6424..d865c79db3 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1657Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1657Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1657;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1657Test {
-    private static _1657.Solution1 solution1;
+    private _1657.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1657.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1658Test.java b/src/test/java/com/fishercoder/secondthousand/_1658Test.java
index c4f2cf870c..ccddb9fabd 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1658Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1658Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1658;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1658Test {
-    private static _1658.Solution1 solution1;
+    private _1658.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1658.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1663Test.java b/src/test/java/com/fishercoder/secondthousand/_1663Test.java
index fae719c7ba..aba1cf7296 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1663Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1663Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1663;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1663Test {
-    private static _1663.Solution1 solution1;
+    private _1663.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1663.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1669Test.java b/src/test/java/com/fishercoder/secondthousand/_1669Test.java
index cffbf6518f..ff61ce82d3 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1669Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1669Test.java
@@ -3,14 +3,14 @@
 import com.fishercoder.common.classes.ListNode;
 import com.fishercoder.common.utils.LinkedListUtils;
 import com.fishercoder.solutions.secondthousand._1669;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1669Test {
-    private static _1669.Solution1 solution1;
-    private static _1669.Solution2 solution2;
+    private _1669.Solution1 solution1;
+    private _1669.Solution2 solution2;
     private static ListNode l1;
     private static ListNode l2;
     private static int a;
@@ -20,7 +20,7 @@ public class _1669Test {
     private static ListNode expected;
     private static ListNode actual;
 
-    @Before
+    @BeforeEach
     public void setup() {
         solution1 = new _1669.Solution1();
         solution2 = new _1669.Solution2();
diff --git a/src/test/java/com/fishercoder/secondthousand/_1670Test.java b/src/test/java/com/fishercoder/secondthousand/_1670Test.java
index d034e4cd83..fad0c4a6c9 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1670Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1670Test.java
@@ -1,12 +1,12 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1670;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1670Test {
-    private static _1670.Solution1.FrontMiddleBackQueue solution1;
+    private _1670.Solution1.FrontMiddleBackQueue solution1;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1673Test.java b/src/test/java/com/fishercoder/secondthousand/_1673Test.java
index 56d63cb99a..4bac51f975 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1673Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1673Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1673;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1673Test {
-    private static _1673.Solution1 solution1;
+    private _1673.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1673.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1675Test.java b/src/test/java/com/fishercoder/secondthousand/_1675Test.java
index a1147c7844..c437a6db8e 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1675Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1675Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1675;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1675Test {
-    private static _1675.Solution1 solution1;
+    private _1675.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1675.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1676Test.java b/src/test/java/com/fishercoder/secondthousand/_1676Test.java
index a4a7554d96..018307d023 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1676Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1676Test.java
@@ -3,19 +3,19 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.secondthousand._1676;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1676Test {
-    private static _1676.Solution1 solution1;
-    private static _1676.Solution2 solution2;
+    private _1676.Solution1 solution1;
+    private _1676.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1676.Solution1();
         solution2 = new _1676.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1679Test.java b/src/test/java/com/fishercoder/secondthousand/_1679Test.java
index b14c06f990..6d4d671ae1 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1679Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1679Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1679;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1679Test {
-    private static _1679.Solution1 solution1;
+    private _1679.Solution1 solution1;
     private static int[] nums;
     private static int k;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1679.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1685Test.java b/src/test/java/com/fishercoder/secondthousand/_1685Test.java
index 88e9a3b15c..28934e3bbc 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1685Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1685Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1685;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1685Test {
-    private static _1685.Solution1 solution1;
+    private _1685.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1685.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1686Test.java b/src/test/java/com/fishercoder/secondthousand/_1686Test.java
index 69abe882d5..392dfb8d24 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1686Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1686Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1686;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1686Test {
-    private static _1686.Solution1 solution1;
+    private _1686.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1686.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1688Test.java b/src/test/java/com/fishercoder/secondthousand/_1688Test.java
index 1218f29a86..fefdb2f6c5 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1688Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1688Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1688;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1688Test {
-    private static _1688.Solution1 solution1;
+    private _1688.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1688.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1690Test.java b/src/test/java/com/fishercoder/secondthousand/_1690Test.java
index 9ad4c34378..dbe772bbb9 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1690Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1690Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1690;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1690Test {
-    private static _1690.Solution1 solution1;
+    private _1690.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1690.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1694Test.java b/src/test/java/com/fishercoder/secondthousand/_1694Test.java
index 444ee056de..6ff63cd04c 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1694Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1694Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1694;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1694Test {
-    private static _1694.Solution1 solution1;
+    private _1694.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1694.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1695Test.java b/src/test/java/com/fishercoder/secondthousand/_1695Test.java
index 62b8bd004a..f2fe7cb561 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1695Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1695Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1695;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1695Test {
-    private static _1695.Solution1 solution1;
-    private static _1695.Solution2 solution2;
+    private _1695.Solution1 solution1;
+    private _1695.Solution2 solution2;
     private static int[] nums;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1695.Solution1();
         solution2 = new _1695.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1700Test.java b/src/test/java/com/fishercoder/secondthousand/_1700Test.java
index 211571d762..be02e761fc 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1700Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1700Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1700;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1700Test {
-    private static _1700.Solution1 solution1;
+    private _1700.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1700.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1701Test.java b/src/test/java/com/fishercoder/secondthousand/_1701Test.java
index 274185b2ab..d30e706ea0 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1701Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1701Test.java
@@ -4,10 +4,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1701Test {
-    private static _1701.Solution1 solution1;
+    private _1701.Solution1 solution1;
     private static int[] A;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/secondthousand/_1705Test.java b/src/test/java/com/fishercoder/secondthousand/_1705Test.java
index 50e5ecea88..c8929c78c3 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1705Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1705Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1705;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1705Test {
-    private static _1705.Solution1 solution1;
+    private _1705.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1705.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1708Test.java b/src/test/java/com/fishercoder/secondthousand/_1708Test.java
index c36cc722bd..cdad2bdfcc 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1708Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1708Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1708;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1708Test {
-    private static _1708.Solution1 solution1;
+    private _1708.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1708.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1711Test.java b/src/test/java/com/fishercoder/secondthousand/_1711Test.java
index 1d437954cb..ee722c9de7 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1711Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1711Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1711Test {
-    private static _1711.Solution1 solution1;
+    private _1711.Solution1 solution1;
     private static int[] deliciousness;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/secondthousand/_1716Test.java b/src/test/java/com/fishercoder/secondthousand/_1716Test.java
index efd995b05e..79eaa34871 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1716Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1716Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1716;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1716Test {
-    private static _1716.Solution1 solution1;
+    private _1716.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1716.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1717Test.java b/src/test/java/com/fishercoder/secondthousand/_1717Test.java
index 0df488090b..3abd54f5d6 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1717Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1717Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1717Test {
-    private static _1717.Solution1 solution1;
+    private _1717.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1718Test.java b/src/test/java/com/fishercoder/secondthousand/_1718Test.java
index 855fafc450..9daf6171c4 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1718Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1718Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1718;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1718Test {
-    private static _1718.Solution1 solution1;
+    private _1718.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1718.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1721Test.java b/src/test/java/com/fishercoder/secondthousand/_1721Test.java
index 3db424f01c..74a9dab4b8 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1721Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1721Test.java
@@ -3,21 +3,21 @@
 import com.fishercoder.common.classes.ListNode;
 import com.fishercoder.common.utils.LinkedListUtils;
 import com.fishercoder.solutions.secondthousand._1721;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1721Test {
-    private static _1721.Solution1 solution1;
-    private static _1721.Solution2 solution2;
-    private static _1721.Solution3 solution3;
+    private _1721.Solution1 solution1;
+    private _1721.Solution2 solution2;
+    private _1721.Solution3 solution3;
     private static ListNode expected;
     private static ListNode node;
     private static int k;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1721.Solution1();
         solution2 = new _1721.Solution2();
         solution3 = new _1721.Solution3();
diff --git a/src/test/java/com/fishercoder/secondthousand/_1726Test.java b/src/test/java/com/fishercoder/secondthousand/_1726Test.java
index 2af7f58e7a..fcdc1e8598 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1726Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1726Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1726;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1726Test {
-    private static _1726.Solution1 solution1;
-    private static _1726.Solution2 solution2;
+    private _1726.Solution1 solution1;
+    private _1726.Solution2 solution2;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1726.Solution1();
         solution2 = new _1726.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1727Test.java b/src/test/java/com/fishercoder/secondthousand/_1727Test.java
index bdde933673..21c0d47965 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1727Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1727Test.java
@@ -2,17 +2,17 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.secondthousand._1727;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1727Test {
-    private static _1727.Solution1 solution1;
+    private _1727.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1727.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1730Test.java b/src/test/java/com/fishercoder/secondthousand/_1730Test.java
index a68bcbe0a8..df688235c6 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1730Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1730Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1730Test {
-    private static _1730.Solution1 test;
+    private _1730.Solution1 test;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1733Test.java b/src/test/java/com/fishercoder/secondthousand/_1733Test.java
index b48f18f95a..34e5b6f034 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1733Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1733Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1733;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1733Test {
-    private static _1733.Solution1 solution1;
+    private _1733.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1733.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1745Test.java b/src/test/java/com/fishercoder/secondthousand/_1745Test.java
index 8e3a2c2152..001f2d3043 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1745Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1745Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1745;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1745Test {
-    private static _1745.Solution1 solution1;
+    private _1745.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1745.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1746Test.java b/src/test/java/com/fishercoder/secondthousand/_1746Test.java
index 3e148743cc..3c8f412190 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1746Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1746Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1746;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1746Test {
-    private static _1746.Solution1 solution1;
+    private _1746.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1746.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1752Test.java b/src/test/java/com/fishercoder/secondthousand/_1752Test.java
index 7a7813be3e..c288b8169b 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1752Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1752Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1752;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1752Test {
-    private static _1752.Solution1 solution1;
+    private _1752.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1752.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1753Test.java b/src/test/java/com/fishercoder/secondthousand/_1753Test.java
index 49618527b2..50fd9a1b9a 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1753Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1753Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1753;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1753Test {
-    private static _1753.Solution1 solution1;
+    private _1753.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1753.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1754Test.java b/src/test/java/com/fishercoder/secondthousand/_1754Test.java
index e76c3cd27d..5ab0f95bd1 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1754Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1754Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1754;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1754Test {
-    private static _1754.Solution1 solution1;
+    private _1754.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1754.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1758Test.java b/src/test/java/com/fishercoder/secondthousand/_1758Test.java
index 39e849907a..3221bfa208 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1758Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1758Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1758;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1758Test {
-    private static _1758.Solution1 solution1;
+    private _1758.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1758.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1759Test.java b/src/test/java/com/fishercoder/secondthousand/_1759Test.java
index 63df9186c4..0da9921f0f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1759Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1759Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1759;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1759Test {
-    private static _1759.Solution1 solution1;
+    private _1759.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1759.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1762Test.java b/src/test/java/com/fishercoder/secondthousand/_1762Test.java
index 74e8a61ae3..1bb639442d 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1762Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1762Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1762Test {
-    private static _1762.Solution1 solution1;
+    private _1762.Solution1 solution1;
     private static int[] heights;
     private static int[] expected;
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1768Test.java b/src/test/java/com/fishercoder/secondthousand/_1768Test.java
index 463125b3ba..1e257ab32f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1768Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1768Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1768;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _1768Test {
-    private static _1768.Solution1 solution1;
-    private static _1768.Solution2 solution2;
+    private _1768.Solution1 solution1;
+    private _1768.Solution2 solution2;
     private static String word1;
     private static String word2;
     private static String expected;
     private static String actual;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1768.Solution1();
         solution2 = new _1768.Solution2();
     }
@@ -25,8 +25,8 @@ public void test1() {
         word2 = "pqr";
         expected = "apbqcr";
         actual = solution1.mergeAlternately(word1, word2);
-        Assert.assertEquals(actual, expected);
+        Assertions.assertEquals(actual, expected);
         actual = solution2.mergeAlternately(word1, word2);
-        Assert.assertEquals(actual, expected);
+        Assertions.assertEquals(actual, expected);
     }
 }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1772Test.java b/src/test/java/com/fishercoder/secondthousand/_1772Test.java
index b00848dc11..5b8f9d57c0 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1772Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1772Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1772;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1772Test {
-    private static _1772.Solution1 solution1;
+    private _1772.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1772.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1774Test.java b/src/test/java/com/fishercoder/secondthousand/_1774Test.java
index ad0da8ac86..f85515fcb5 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1774Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1774Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1774;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1774Test {
-    private static _1774.Solution1 solution1;
+    private _1774.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1774.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1775Test.java b/src/test/java/com/fishercoder/secondthousand/_1775Test.java
index 54769a5c74..0627d65c7f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1775Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1775Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1775;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1775Test {
-    private static _1775.Solution1 solution1;
+    private _1775.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1775.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1781Test.java b/src/test/java/com/fishercoder/secondthousand/_1781Test.java
index fc9b1cc3f3..ae91f5eefb 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1781Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1781Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1781;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1781Test {
-    private static _1781.Solution1 solution1;
+    private _1781.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1781.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1790Test.java b/src/test/java/com/fishercoder/secondthousand/_1790Test.java
index 1b3673695c..b782a9c64f 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1790Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1790Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1790;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1790Test {
-    private static _1790.Solution1 solution1;
+    private _1790.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1790.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1792Test.java b/src/test/java/com/fishercoder/secondthousand/_1792Test.java
index 18b3f9dce3..ecfb50d515 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1792Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1792Test.java
@@ -2,16 +2,16 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.secondthousand._1792;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1792Test {
-    private static _1792.Solution1 solution1;
+    private _1792.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1792.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1804Test.java b/src/test/java/com/fishercoder/secondthousand/_1804Test.java
index 36d4abef8d..96bbc42e42 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1804Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1804Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1804;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1804Test {
-    private static _1804.Solution1.Trie solution1;
+    private _1804.Solution1.Trie solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
 
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1813Test.java b/src/test/java/com/fishercoder/secondthousand/_1813Test.java
index 71a09de749..55f09e23a1 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1813Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1813Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1813;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1813Test {
-    private static _1813.Solution1 solution1;
+    private _1813.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1813.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1814Test.java b/src/test/java/com/fishercoder/secondthousand/_1814Test.java
index 7d3b79c827..c36ff4a7da 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1814Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1814Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1814;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1814Test {
-    private static _1814.Solution1 solution1;
+    private _1814.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1814.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1823Test.java b/src/test/java/com/fishercoder/secondthousand/_1823Test.java
index 5fc4f9ca0b..84244a979c 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1823Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1823Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1823;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1823Test {
-    private static _1823.Solution1 solution1;
-    private static _1823.Solution2 solution2;
+    private _1823.Solution1 solution1;
+    private _1823.Solution2 solution2;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1823.Solution1();
         solution2 = new _1823.Solution2();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1826Test.java b/src/test/java/com/fishercoder/secondthousand/_1826Test.java
index 5464a908dc..5c92980e77 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1826Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1826Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1826;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1826Test {
-    private static _1826.Solution1 solution1;
+    private _1826.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1826.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1836Test.java b/src/test/java/com/fishercoder/secondthousand/_1836Test.java
index 4c0cf9f1a2..f5e8ed6500 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1836Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1836Test.java
@@ -2,16 +2,16 @@
 
 import com.fishercoder.common.utils.LinkedListUtils;
 import com.fishercoder.solutions.secondthousand._1836;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1836Test {
-    private static _1836.Solution1 solution1;
+    private _1836.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1836.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1844Test.java b/src/test/java/com/fishercoder/secondthousand/_1844Test.java
index f00fb32e75..9cf74340cd 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1844Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1844Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1844;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _1844Test {
-    private static _1844.Solution1 solution1;
-    private static _1844.Solution2 solution2;
+    private _1844.Solution1 solution1;
+    private _1844.Solution2 solution2;
     private static String s;
     private static String actual;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1844.Solution1();
         solution2 = new _1844.Solution2();
     }
@@ -22,7 +22,7 @@ public void test1() {
         s = "a1c1e1";
         actual = "abcdef";
         String expected = solution1.replaceDigits(s);
-        Assert.assertEquals(actual, expected);
+        Assertions.assertEquals(actual, expected);
     }
 
     @Test
@@ -30,6 +30,6 @@ public void test2() {
         s = "a1c1e1";
         actual = "abcdef";
         String expected = solution2.replaceDigits(s);
-        Assert.assertEquals(actual, expected);
+        Assertions.assertEquals(actual, expected);
     }
 }
\ No newline at end of file
diff --git a/src/test/java/com/fishercoder/secondthousand/_1861Test.java b/src/test/java/com/fishercoder/secondthousand/_1861Test.java
index 2ee8d730e4..6982b0e497 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1861Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1861Test.java
@@ -1,29 +1,29 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1861;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1861Test {
-    private static _1861.Solution1 solution1;
+    private _1861.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1861.Solution1();
     }
 
     @Test
     public void test1() {
-        assertEquals(new char[][]{{'.'}, {'#'}, {'#'}}, solution1.rotateTheBox(new char[][]{
+        assertArrayEquals(new char[][]{{'.'}, {'#'}, {'#'}}, solution1.rotateTheBox(new char[][]{
                 {'#', '.', '#'}
         }));
     }
 
     @Test
     public void test2() {
-        assertEquals(new char[][]{
+        assertArrayEquals(new char[][]{
                         {'#', '.'},
                         {'#', '#'},
                         {'*', '*'},
@@ -36,7 +36,7 @@ public void test2() {
 
     @Test
     public void test3() {
-        assertEquals(new char[][]{
+        assertArrayEquals(new char[][]{
                         {'.', '#', '#'},
                         {'.', '#', '#'},
                         {'#', '#', '*'},
diff --git a/src/test/java/com/fishercoder/secondthousand/_1862Test.java b/src/test/java/com/fishercoder/secondthousand/_1862Test.java
index 3d68d771bf..5155d89546 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1862Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1862Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1862;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1862Test {
-    private static _1862.Solution1 solution1;
+    private _1862.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1862.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1868Test.java b/src/test/java/com/fishercoder/secondthousand/_1868Test.java
index a8987401a8..0eda298a7a 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1868Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1868Test.java
@@ -9,7 +9,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1868Test {
-    private static _1868.Solution1 solution1;
+    private _1868.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1869Test.java b/src/test/java/com/fishercoder/secondthousand/_1869Test.java
index 6206370ad8..cc7cc0d596 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1869Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1869Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1869;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1869Test {
-    private static _1869.Solution1 solution1;
+    private _1869.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1869.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1886Test.java b/src/test/java/com/fishercoder/secondthousand/_1886Test.java
index 5bcb5f532f..372c05161d 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1886Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1886Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1886;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1886Test {
-    private static _1886.Solution1 solution1;
+    private _1886.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1886.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1891Test.java b/src/test/java/com/fishercoder/secondthousand/_1891Test.java
index cbd5cec6b0..e08b31c7e3 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1891Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1891Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1891;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1891Test {
-    private static _1891.Solution1 solution1;
+    private _1891.Solution1 solution1;
     private static int[] ribbons;
     private static int k;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1891.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1893Test.java b/src/test/java/com/fishercoder/secondthousand/_1893Test.java
index 40a3e09bff..69914fc5ea 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1893Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1893Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1893;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1893Test {
-    private static _1893.Solution1 solution1;
+    private _1893.Solution1 solution1;
     private static int[][] ranges;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1893.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1903Test.java b/src/test/java/com/fishercoder/secondthousand/_1903Test.java
index 28467f1d79..98e85eea9e 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1903Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1903Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1903;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1903Test {
-    private static _1903.Solution1 solution1;
+    private _1903.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1903.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1904Test.java b/src/test/java/com/fishercoder/secondthousand/_1904Test.java
index aea5738ea0..e3849734d2 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1904Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1904Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1904;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1904Test {
-    private static _1904.Solution1 solution1;
+    private _1904.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1904.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1933Test.java b/src/test/java/com/fishercoder/secondthousand/_1933Test.java
index 40a1ffdcf7..5a036f258c 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1933Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1933Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1933;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1933Test {
-    private static _1933.Solution1 solution1;
+    private _1933.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1933.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1936Test.java b/src/test/java/com/fishercoder/secondthousand/_1936Test.java
index 011059b270..1f72235001 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1936Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1936Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1936;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1936Test {
-    private static _1936.Solution1 solution1;
+    private _1936.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1936.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1945Test.java b/src/test/java/com/fishercoder/secondthousand/_1945Test.java
index b69f5c4e47..9fb047f63c 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1945Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1945Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1945;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1945Test {
-    private static _1945.Solution1 solution1;
+    private _1945.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1945.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1966Test.java b/src/test/java/com/fishercoder/secondthousand/_1966Test.java
index 26c3c08f0b..7033cd1876 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1966Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1966Test.java
@@ -1,20 +1,20 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1966;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1966Test {
-    private static _1966.Solution1 solution1;
-    private static _1966.Solution2 solution2;
-    private static _1966.Solution3 solution3;
+    private _1966.Solution1 solution1;
+    private _1966.Solution2 solution2;
+    private _1966.Solution3 solution3;
     private static int[] nums;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1966.Solution1();
         solution2 = new _1966.Solution2();
         solution3 = new _1966.Solution3();
diff --git a/src/test/java/com/fishercoder/secondthousand/_1968Test.java b/src/test/java/com/fishercoder/secondthousand/_1968Test.java
index 3af3b5d2d1..d13f2da10b 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1968Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1968Test.java
@@ -2,14 +2,14 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.secondthousand._1968;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _1968Test {
-    private static _1968.Solution1 solution1;
+    private _1968.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1968.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1971Test.java b/src/test/java/com/fishercoder/secondthousand/_1971Test.java
index 632970f726..876410ed5b 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1971Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1971Test.java
@@ -2,16 +2,16 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.secondthousand._1971;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1971Test {
-    private static _1971.Solution1 solution1;
+    private _1971.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1971.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1973Test.java b/src/test/java/com/fishercoder/secondthousand/_1973Test.java
index 1c1510afa7..6f5bc6f18a 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1973Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1973Test.java
@@ -11,7 +11,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1973Test {
-    private static _1973.Solution1 solution1;
+    private _1973.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1974Test.java b/src/test/java/com/fishercoder/secondthousand/_1974Test.java
index d40d77c56f..ca8119715d 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1974Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1974Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1974;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1974Test {
-    private static _1974.Solution1 solution1;
+    private _1974.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1974.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1981Test.java b/src/test/java/com/fishercoder/secondthousand/_1981Test.java
index 2ddbcff702..1dd5975128 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1981Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1981Test.java
@@ -2,15 +2,15 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.secondthousand._1981;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1981Test {
-    private static _1981.Solution1 solution1;
+    private _1981.Solution1 solution1;
 
-    @Before
+    @BeforeEach
     public void setup() {
         solution1 = new _1981.Solution1();
     }
diff --git a/src/test/java/com/fishercoder/secondthousand/_1984Test.java b/src/test/java/com/fishercoder/secondthousand/_1984Test.java
index 05bd1e9c81..d09eccde5a 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1984Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1984Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1984;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1984Test {
-    private static _1984.Solution1 solution1;
+    private _1984.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1984.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1985Test.java b/src/test/java/com/fishercoder/secondthousand/_1985Test.java
index efd45c8cde..3c7d65fa77 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1985Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1985Test.java
@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.Test;
 
 public class _1985Test {
-    private static _1985.Solution1 solution1;
+    private _1985.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/secondthousand/_1991Test.java b/src/test/java/com/fishercoder/secondthousand/_1991Test.java
index 05b1d3b5ec..5380d7f420 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1991Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1991Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.secondthousand;
 
 import com.fishercoder.solutions.secondthousand._1991;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _1991Test {
-    private static _1991.Solution1 solution1;
+    private _1991.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1991.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/secondthousand/_1992Test.java b/src/test/java/com/fishercoder/secondthousand/_1992Test.java
index ab8da85b6a..0e1dc53c65 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1992Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1992Test.java
@@ -2,22 +2,22 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.secondthousand._1992;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _1992Test {
-    private static _1992.Solution1 solution1;
+    private _1992.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _1992.Solution1();
     }
 
     @Test
     public void test1() {
-        assertEquals(new int[][]{{13, 1, 28, 1}, {22, 4, 24, 39}}, solution1.findFarmland(CommonUtils.convertLeetCodeIrregularLengths2DArrayInputIntoJavaArray(""
+        assertArrayEquals(new int[][]{{13, 1, 28, 1}, {22, 4, 24, 39}}, solution1.findFarmland(CommonUtils.convertLeetCodeIrregularLengths2DArrayInputIntoJavaArray(""
                 + "[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"//0
                 + "[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"//1
                 + "[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"//2
diff --git a/src/test/java/com/fishercoder/secondthousand/_1993Test.java b/src/test/java/com/fishercoder/secondthousand/_1993Test.java
index dfa6c73e91..13fcc02c4e 100644
--- a/src/test/java/com/fishercoder/secondthousand/_1993Test.java
+++ b/src/test/java/com/fishercoder/secondthousand/_1993Test.java
@@ -8,7 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class _1993Test {
-    private static _1993.Solution1.LockingTree lockingTree;
+    private _1993.Solution1.LockingTree lockingTree;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2001Test.java b/src/test/java/com/fishercoder/thirdthousand/_2001Test.java
index 88b2f88d3f..fac43ec882 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2001Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2001Test.java
@@ -8,8 +8,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2001Test {
-    private static _2001.Solution1 solution1;
-    private static _2001.Solution2 solution2;
+    private _2001.Solution1 solution1;
+    private _2001.Solution2 solution2;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2007Test.java b/src/test/java/com/fishercoder/thirdthousand/_2007Test.java
index e2291a9bdb..0e129fdeb3 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2007Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2007Test.java
@@ -2,14 +2,14 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.thirdthousand._2007;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _2007Test {
-    private static _2007.Solution1 solution1;
+    private _2007.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2007.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2012Test.java b/src/test/java/com/fishercoder/thirdthousand/_2012Test.java
index 4fea58bc46..121f62046e 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2012Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2012Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2012;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2012Test {
-    private static _2012.Solution1 solution1;
+    private _2012.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2012.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2017Test.java b/src/test/java/com/fishercoder/thirdthousand/_2017Test.java
index 216e65e8c3..acac66b34a 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2017Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2017Test.java
@@ -2,18 +2,18 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.thirdthousand._2017;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2017Test {
-    private static _2017.Solution1 solution1;
+    private _2017.Solution1 solution1;
     private static int[][] grid;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2017.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2018Test.java b/src/test/java/com/fishercoder/thirdthousand/_2018Test.java
index 8177519d32..b7ec4ccc7c 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2018Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2018Test.java
@@ -2,16 +2,16 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.thirdthousand._2018;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2018Test {
-    private static _2018.Solution1 solution1;
+    private _2018.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2018.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2024Test.java b/src/test/java/com/fishercoder/thirdthousand/_2024Test.java
index eccac9e33a..04efb319a9 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2024Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2024Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2024;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2024Test {
-    private static _2024.Solution1 solution1;
+    private _2024.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2024.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2028Test.java b/src/test/java/com/fishercoder/thirdthousand/_2028Test.java
index dce787dda8..2f88eee190 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2028Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2028Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2028;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _2028Test {
-    private static _2028.Solution1 solution1;
+    private _2028.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2028.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2038Test.java b/src/test/java/com/fishercoder/thirdthousand/_2038Test.java
index 7956264ccc..70a28cc0a7 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2038Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2038Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2038;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2038Test {
-    private static _2038.Solution1 solution1;
+    private _2038.Solution1 solution1;
     private static String color;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2038.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2039Test.java b/src/test/java/com/fishercoder/thirdthousand/_2039Test.java
index 7e39c7c47c..31bdc9389d 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2039Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2039Test.java
@@ -2,18 +2,18 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.thirdthousand._2039;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2039Test {
-    private static _2039.Solution1 solution1;
+    private _2039.Solution1 solution1;
     private static int[][] edges;
     private static int[] patience;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2039.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2049Test.java b/src/test/java/com/fishercoder/thirdthousand/_2049Test.java
index 7881323622..46ea5638e2 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2049Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2049Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2049Test {
-    private static _2049.Solution1 solution1;
+    private _2049.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2050Test.java b/src/test/java/com/fishercoder/thirdthousand/_2050Test.java
index 1875a17219..38cedc22a2 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2050Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2050Test.java
@@ -2,20 +2,20 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.thirdthousand._2050;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2050Test {
-    private static _2050.Solution1 solution1;
+    private _2050.Solution1 solution1;
     private static int[][] relation;
     private static int[] time;
     private static int n;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2050.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2054Test.java b/src/test/java/com/fishercoder/thirdthousand/_2054Test.java
index a1fdcfd4c5..2868729fdb 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2054Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2054Test.java
@@ -2,19 +2,19 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.thirdthousand._2054;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2054Test {
-    private static _2054.Solution1 solution1;
+    private _2054.Solution1 solution1;
     private static int[][] events;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2054.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2063Test.java b/src/test/java/com/fishercoder/thirdthousand/_2063Test.java
index c07dd7f229..75be62873f 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2063Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2063Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2063;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2063Test {
-    private static _2063.Solution1 solution1;
+    private _2063.Solution1 solution1;
     private static String word;
     private static long expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2063.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2070Test.java b/src/test/java/com/fishercoder/thirdthousand/_2070Test.java
index 322d9fb378..6a8f1f701b 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2070Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2070Test.java
@@ -2,19 +2,19 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.thirdthousand._2070;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _2070Test {
-    private static _2070.Solution1 solution1;
+    private _2070.Solution1 solution1;
     private static int[][] items;
     private static int[] queries;
     private static int[] expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2070.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2075Test.java b/src/test/java/com/fishercoder/thirdthousand/_2075Test.java
index ebbf78c441..c5bc147610 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2075Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2075Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2075;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2075Test {
-    private static _2075.Solution1 solution1;
+    private _2075.Solution1 solution1;
     private static String encodedText;
     private static int rows;
     private static String expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2075.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2076Test.java b/src/test/java/com/fishercoder/thirdthousand/_2076Test.java
index 0154a44827..d6e469e98b 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2076Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2076Test.java
@@ -2,20 +2,20 @@
 
 import com.fishercoder.common.utils.CommonUtils;
 import com.fishercoder.solutions.thirdthousand._2076;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _2076Test {
-    private static _2076.Solution1 solution1;
+    private _2076.Solution1 solution1;
     private static int[][] restrictions;
     private static int[][] requests;
     private static int n;
     private static boolean[] expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2076.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2080Test.java b/src/test/java/com/fishercoder/thirdthousand/_2080Test.java
index 0c8a025662..012ff948e4 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2080Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2080Test.java
@@ -1,13 +1,13 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2080;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2080Test {
-    private static _2080.Solution1.RangeFreqQuery rangeFreqQuery1;
-    private static _2080.Solution2.RangeFreqQuery rangeFreqQuery2;
+    private _2080.Solution1.RangeFreqQuery rangeFreqQuery1;
+    private _2080.Solution2.RangeFreqQuery rangeFreqQuery2;
 
     @Test
     public void test1() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2096Test.java b/src/test/java/com/fishercoder/thirdthousand/_2096Test.java
index 7f09a6f16f..86ceaf9e4c 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2096Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2096Test.java
@@ -11,7 +11,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2096Test {
-    private static _2096.Solution1 solution1;
+    private _2096.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2103Test.java b/src/test/java/com/fishercoder/thirdthousand/_2103Test.java
index 95a6fe83ca..3fe9f65cfd 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2103Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2103Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2103;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2103Test {
-    private static _2103.Solution1 solution1;
+    private _2103.Solution1 solution1;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2103.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2115Test.java b/src/test/java/com/fishercoder/thirdthousand/_2115Test.java
index 7473425d3e..66f85e77da 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2115Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2115Test.java
@@ -9,7 +9,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2115Test {
-    private static _2115.Solution1 solution1;
+    private _2115.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2116Test.java b/src/test/java/com/fishercoder/thirdthousand/_2116Test.java
index dc1aa39121..20c0af1029 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2116Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2116Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2116;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2116Test {
-    private static _2116.Solution1 solution1;
+    private _2116.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2116.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2126Test.java b/src/test/java/com/fishercoder/thirdthousand/_2126Test.java
index 17982576b5..b1359096cf 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2126Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2126Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2126;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2126Test {
-    private static _2126.Solution1 solution1;
+    private _2126.Solution1 solution1;
     private static int[] asteroids;
     private static int mass;
     private boolean expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2126.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2134Test.java b/src/test/java/com/fishercoder/thirdthousand/_2134Test.java
index ab2b1aea63..0545410c1a 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2134Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2134Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2134Test {
-    private static _2134.Solution1 solution1;
+    private _2134.Solution1 solution1;
     private static int[] nums;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2135Test.java b/src/test/java/com/fishercoder/thirdthousand/_2135Test.java
index 4b105a1f3c..441016e2e0 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2135Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2135Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2135Test {
-    private static _2135.Solution1 solution1;
+    private _2135.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2144Test.java b/src/test/java/com/fishercoder/thirdthousand/_2144Test.java
index b1e91a95d8..266cdbea55 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2144Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2144Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2144;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2144Test {
-    private static _2144.Solution1 solution1;
+    private _2144.Solution1 solution1;
     private static int[] cost;
     private static int expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2144.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2156Test.java b/src/test/java/com/fishercoder/thirdthousand/_2156Test.java
index 2e15085434..3f185dc483 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2156Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2156Test.java
@@ -1,13 +1,13 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2156;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2156Test {
-    private static _2156.Solution1 solution1;
+    private _2156.Solution1 solution1;
     private static String s;
     private int power;
     private int modulo;
@@ -15,8 +15,8 @@ public class _2156Test {
     private static int hashValue;
     private static String expected;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2156.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2190Test.java b/src/test/java/com/fishercoder/thirdthousand/_2190Test.java
index f266838d37..0650bad0e7 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2190Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2190Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2190;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2190Test {
-    private static _2190.Solution1 solution1;
+    private _2190.Solution1 solution1;
     private static int[] nums;
     private static int key;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2190.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2191Test.java b/src/test/java/com/fishercoder/thirdthousand/_2191Test.java
index 29bab5a425..85f58cfaa9 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2191Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2191Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _2191Test {
-    private static _2191.Solution1 solution1;
+    private _2191.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2192Test.java b/src/test/java/com/fishercoder/thirdthousand/_2192Test.java
index eae8faa7bd..675718ea3b 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2192Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2192Test.java
@@ -10,7 +10,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2192Test {
-    private static _2192.Solution1 solution1;
+    private _2192.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2196Test.java b/src/test/java/com/fishercoder/thirdthousand/_2196Test.java
index 90c2509172..9c440aef78 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2196Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2196Test.java
@@ -8,10 +8,10 @@
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2196Test {
-    private static _2196.Solution1 solution1;
+    private _2196.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2220Test.java b/src/test/java/com/fishercoder/thirdthousand/_2220Test.java
index 842a7ecce7..55c901f6af 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2220Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2220Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2220;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2220Test {
-    private static _2220.Solution1 solution1;
+    private _2220.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2220.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2224Test.java b/src/test/java/com/fishercoder/thirdthousand/_2224Test.java
index 1b479821ef..296aafc18a 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2224Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2224Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2224;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2224Test {
-    private static _2224.Solution1 solution1;
+    private _2224.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2224.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2231Test.java b/src/test/java/com/fishercoder/thirdthousand/_2231Test.java
index ee194621aa..8bbe2eb49b 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2231Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2231Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2231Test {
-    private static _2231.Solution1 solution1;
+    private _2231.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2265Test.java b/src/test/java/com/fishercoder/thirdthousand/_2265Test.java
index 3868e50a12..3b1e55d759 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2265Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2265Test.java
@@ -11,7 +11,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2265Test {
-    private static _2265.Solution1 solution1;
+    private _2265.Solution1 solution1;
     private static TreeNode root;
 
     @BeforeEach
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2273Test.java b/src/test/java/com/fishercoder/thirdthousand/_2273Test.java
index 6f8d935f13..7bc3fc1062 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2273Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2273Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2273;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2273Test {
-    private static _2273.Solution1 solution1;
+    private _2273.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2273.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2284Test.java b/src/test/java/com/fishercoder/thirdthousand/_2284Test.java
index b5849817fd..50ba9ebf87 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2284Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2284Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2284;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2284Test {
-    private static _2284.Solution1 solution1;
+    private _2284.Solution1 solution1;
     private static String[] messages;
     private static String[] senders;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2284.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2293Test.java b/src/test/java/com/fishercoder/thirdthousand/_2293Test.java
index fe53c92640..6a7940e9a6 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2293Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2293Test.java
@@ -1,19 +1,19 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2293;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2293Test {
-    private static _2293.Solution1 solution1;
+    private _2293.Solution1 solution1;
     private static int expected;
     private static int[] nums;
     private static String s;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2293.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2300Test.java b/src/test/java/com/fishercoder/thirdthousand/_2300Test.java
index 3b94cd731d..eb1aea5e0b 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2300Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2300Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _2300Test {
-    private static _2300.Solution1 solution1;
+    private _2300.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2309Test.java b/src/test/java/com/fishercoder/thirdthousand/_2309Test.java
index 493b13e563..bab8368410 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2309Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2309Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2309;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2309Test {
-    private static _2309.Solution1 solution1;
+    private _2309.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2309.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2315Test.java b/src/test/java/com/fishercoder/thirdthousand/_2315Test.java
index 62164ae57f..28c257d24b 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2315Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2315Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2315;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2315Test {
-    private static _2315.Solution1 solution1;
+    private _2315.Solution1 solution1;
     private static String s;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2315.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2316Test.java b/src/test/java/com/fishercoder/thirdthousand/_2316Test.java
index 50dd01ddff..42ad5032bd 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2316Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2316Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2316Test {
-    private static _2316.Solution1 solution1;
+    private _2316.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2325Test.java b/src/test/java/com/fishercoder/thirdthousand/_2325Test.java
index 3df4eeef53..4618ccdca0 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2325Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2325Test.java
@@ -1,18 +1,18 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2325;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class _2325Test {
-    private static _2325.Solution1 solution1;
-    private static _2325.Solution2 solution2;
+    private _2325.Solution1 solution1;
+    private _2325.Solution2 solution2;
     private String key;
     private String message;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2325.Solution1();
         solution2 = new _2325.Solution2();
     }
@@ -23,7 +23,7 @@ public void test1() {
         message = "vkbs bs t suepuv";
         String actual = solution1.decodeMessage(key, message);
         String expected = "this is a secret";
-        Assert.assertEquals(actual, expected);
+        Assertions.assertEquals(actual, expected);
     }
 
     @Test
@@ -32,6 +32,6 @@ public void test2() {
         message = "vkbs bs t suepuv";
         String actual = solution2.decodeMessage(key, message);
         String expected = "this is a secret";
-        Assert.assertEquals(actual, expected);
+        Assertions.assertEquals(actual, expected);
     }
 }
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2335Test.java b/src/test/java/com/fishercoder/thirdthousand/_2335Test.java
index 398a42edc5..c5ee1eec76 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2335Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2335Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2335;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2335Test {
-    private static _2335.Solution1 solution1;
+    private _2335.Solution1 solution1;
     private static int[] amount;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2335.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2357Test.java b/src/test/java/com/fishercoder/thirdthousand/_2357Test.java
index af97ddf9c4..5980a14134 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2357Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2357Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2357;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2357Test {
-    private static _2357.Solution1 solution1;
+    private _2357.Solution1 solution1;
     private static int[] nums;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2357.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2373Test.java b/src/test/java/com/fishercoder/thirdthousand/_2373Test.java
index 5d4c617816..bda074b75a 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2373Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2373Test.java
@@ -8,7 +8,7 @@
 
 public class _2373Test {
 
-    private static _2373.Solution1 solution1;
+    private _2373.Solution1 solution1;
     private static int[][] grid;
     private static int[][] expected;
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2385Test.java b/src/test/java/com/fishercoder/thirdthousand/_2385Test.java
index 1e271edc05..de3e3c8eea 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2385Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2385Test.java
@@ -10,7 +10,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2385Test {
-    private static _2385.Solution1 solution1;
+    private _2385.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2389Test.java b/src/test/java/com/fishercoder/thirdthousand/_2389Test.java
index 59889b39bd..f1051026b5 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2389Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2389Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _2389Test {
-    private static _2389.Solution1 solution1;
+    private _2389.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2392Test.java b/src/test/java/com/fishercoder/thirdthousand/_2392Test.java
index 63217c9edc..d6113f908e 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2392Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2392Test.java
@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.Test;
 
 public class _2392Test {
-    private static _2392.Solution1 solution1;
+    private _2392.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2409Test.java b/src/test/java/com/fishercoder/thirdthousand/_2409Test.java
index 7ad363579b..975acdc159 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2409Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2409Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2409Test {
-    private static _2409.Solution1 solution1;
+    private _2409.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2423Test.java b/src/test/java/com/fishercoder/thirdthousand/_2423Test.java
index bd5d30ba9e..612dec6488 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2423Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2423Test.java
@@ -8,7 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class _2423Test {
-    private static _2423.Solution1 solution1;
+    private _2423.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2433Test.java b/src/test/java/com/fishercoder/thirdthousand/_2433Test.java
index af16926531..b570d05419 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2433Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2433Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2433;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _2433Test {
-    private static _2433.Solution1 solution1;
+    private _2433.Solution1 solution1;
     private static int[] pref;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2433.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2437Test.java b/src/test/java/com/fishercoder/thirdthousand/_2437Test.java
index 2978eb89ae..e8acabceb9 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2437Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2437Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2437Test {
-    private static _2437.Solution1 solution1;
+    private _2437.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2441Test.java b/src/test/java/com/fishercoder/thirdthousand/_2441Test.java
index d42a5f87ca..2163a285d1 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2441Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2441Test.java
@@ -4,10 +4,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2441Test {
-    private static _2441.Solution1 solution1;
+    private _2441.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2446Test.java b/src/test/java/com/fishercoder/thirdthousand/_2446Test.java
index dc516a5276..9bee378124 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2446Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2446Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class _2446Test {
-    private static _2446.Solution1 solution1;
+    private _2446.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2451Test.java b/src/test/java/com/fishercoder/thirdthousand/_2451Test.java
index 84fc96618e..63b46fab5a 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2451Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2451Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2451Test {
-    private static _2451.Solution1 solution1;
+    private _2451.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2460Test.java b/src/test/java/com/fishercoder/thirdthousand/_2460Test.java
index 2813f925e0..a5c2347af7 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2460Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2460Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _2460Test {
-    private static _2460.Solution1 solution1;
+    private _2460.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2473Test.java b/src/test/java/com/fishercoder/thirdthousand/_2473Test.java
index 3cdc8222d1..5087b90c8e 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2473Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2473Test.java
@@ -8,7 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _2473Test {
-    private static _2473.Solution1 solution1;
+    private _2473.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2485Test.java b/src/test/java/com/fishercoder/thirdthousand/_2485Test.java
index 4b3737fc68..f2831a19f6 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2485Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2485Test.java
@@ -4,10 +4,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2485Test {
-    private static _2485.Solution1 solution1;
+    private _2485.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2487Test.java b/src/test/java/com/fishercoder/thirdthousand/_2487Test.java
index 7022e1f976..b6cf141e49 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2487Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2487Test.java
@@ -8,7 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2487Test {
-    private static _2487.Solution1 solution1;
+    private _2487.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2492Test.java b/src/test/java/com/fishercoder/thirdthousand/_2492Test.java
index 40ace66dea..311c3d9ef3 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2492Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2492Test.java
@@ -4,10 +4,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2492Test {
-    private static _2492.Solution1 solution1;
+    private _2492.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2500Test.java b/src/test/java/com/fishercoder/thirdthousand/_2500Test.java
index 423ec225ce..e1741ab0b8 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2500Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2500Test.java
@@ -8,7 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2500Test {
-    private static _2500.Solution1 solution1;
+    private _2500.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2511Test.java b/src/test/java/com/fishercoder/thirdthousand/_2511Test.java
index 0e24bdd59d..7f0452d797 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2511Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2511Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2511Test {
-    private static _2511.Solution1 solution1;
+    private _2511.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2515Test.java b/src/test/java/com/fishercoder/thirdthousand/_2515Test.java
index 7bb5901aa1..bc60231538 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2515Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2515Test.java
@@ -1,17 +1,17 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2515;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2515Test {
-    private static _2515.Solution1 solution1;
+    private _2515.Solution1 solution1;
     private static String[] words;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2515.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2525Test.java b/src/test/java/com/fishercoder/thirdthousand/_2525Test.java
index 0c99db0434..096b0e9b62 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2525Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2525Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2525;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2525Test {
-    private static _2525.Solution1 solution1;
+    private _2525.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2525.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2544Test.java b/src/test/java/com/fishercoder/thirdthousand/_2544Test.java
index c1fa23e00a..7f893b8313 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2544Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2544Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2544Test {
-    private static _2544.Solution1 solution1;
+    private _2544.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2566Test.java b/src/test/java/com/fishercoder/thirdthousand/_2566Test.java
index 9e2951beee..8c40d3f820 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2566Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2566Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2566;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2566Test {
-    private static _2566.Solution1 solution1;
+    private _2566.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2566.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2574Test.java b/src/test/java/com/fishercoder/thirdthousand/_2574Test.java
index 26d504b4a9..d4ec3c168c 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2574Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2574Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _2574Test {
-    private static _2574.Solution1 solution1;
+    private _2574.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2578Test.java b/src/test/java/com/fishercoder/thirdthousand/_2578Test.java
index 8e9c4479ae..b45c2ec407 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2578Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2578Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2578Test {
-    private static _2578.Solution1 solution1;
+    private _2578.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2591Test.java b/src/test/java/com/fishercoder/thirdthousand/_2591Test.java
index 9cf8eedf46..96f4d09c36 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2591Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2591Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2591Test {
-    private static _2591.Solution1 solution1;
+    private _2591.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2600Test.java b/src/test/java/com/fishercoder/thirdthousand/_2600Test.java
index 47ba30f5f5..4b8b1f7624 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2600Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2600Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2600Test {
-    private static _2600.Solution1 solution1;
+    private _2600.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2609Test.java b/src/test/java/com/fishercoder/thirdthousand/_2609Test.java
index df59d02a14..d657704d0d 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2609Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2609Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2609Test {
-    private static _2609.Solution1 solution1;
+    private _2609.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2641Test.java b/src/test/java/com/fishercoder/thirdthousand/_2641Test.java
index ca2ede48b1..eb62b652be 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2641Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2641Test.java
@@ -11,7 +11,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2641Test {
-    private static _2641.Solution1 solution1;
+    private _2641.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2644Test.java b/src/test/java/com/fishercoder/thirdthousand/_2644Test.java
index 1ba54013f5..a2bfd1d8a2 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2644Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2644Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2644Test {
-    private static _2644.Solution1 solution1;
+    private _2644.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2670Test.java b/src/test/java/com/fishercoder/thirdthousand/_2670Test.java
index 8ee43d0015..485f188461 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2670Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2670Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2670;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _2670Test {
-    private static _2670.Solution1 solution1;
+    private _2670.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2670.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2673Test.java b/src/test/java/com/fishercoder/thirdthousand/_2673Test.java
index 458c7ee611..ce9787922c 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2673Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2673Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2673Test {
-    private static _2673.Solution1 solution1;
+    private _2673.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2682Test.java b/src/test/java/com/fishercoder/thirdthousand/_2682Test.java
index 8e69e000cf..ede5c35aa5 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2682Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2682Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 public class _2682Test {
-    private static _2682.Solution1 solution1;
+    private _2682.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2689Test.java b/src/test/java/com/fishercoder/thirdthousand/_2689Test.java
index 629ea30060..18a46bfa5c 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2689Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2689Test.java
@@ -8,7 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2689Test {
-    private static _2689.Solution1 solution1;
+    private _2689.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2696Test.java b/src/test/java/com/fishercoder/thirdthousand/_2696Test.java
index d72b78e2f8..f8fa5bc14e 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2696Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2696Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2696;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2696Test {
-    private static _2696.Solution1 solution1;
+    private _2696.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2696.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2710Test.java b/src/test/java/com/fishercoder/thirdthousand/_2710Test.java
index c2a0ec2eeb..ba46bd2860 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2710Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2710Test.java
@@ -1,16 +1,16 @@
 package com.fishercoder.thirdthousand;
 
 import com.fishercoder.solutions.thirdthousand._2710;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2710Test {
-    private static _2710.Solution1 solution1;
+    private _2710.Solution1 solution1;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _2710.Solution1();
     }
 
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2716Test.java b/src/test/java/com/fishercoder/thirdthousand/_2716Test.java
index 4f2cadd183..5f3128742c 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2716Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2716Test.java
@@ -8,7 +8,7 @@
 
 
 public class _2716Test {
-    private static _2716.Solution1 solution1;
+    private _2716.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2717Test.java b/src/test/java/com/fishercoder/thirdthousand/_2717Test.java
index 51626cdd06..f325e865f4 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2717Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2717Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2717Test {
-    private static _2717.Solution1 solution1;
+    private _2717.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2729Test.java b/src/test/java/com/fishercoder/thirdthousand/_2729Test.java
index 011769b3ad..47aaeb78d9 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2729Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2729Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class _2729Test {
-    private static _2729.Solution1 solution1;
+    private _2729.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2739Test.java b/src/test/java/com/fishercoder/thirdthousand/_2739Test.java
index 8a97ccdd03..1625c56431 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2739Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2739Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2739Test {
-    private static _2739.Solution1 solution1;
+    private _2739.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2744Test.java b/src/test/java/com/fishercoder/thirdthousand/_2744Test.java
index b8c718cc31..f61b5511ed 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2744Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2744Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2744Test {
-    private static _2744.Solution1 solution1;
+    private _2744.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2748Test.java b/src/test/java/com/fishercoder/thirdthousand/_2748Test.java
index 04eb3f7fd9..31ba208377 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2748Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2748Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2748Test {
-    private static _2748.Solution1 solution1;
+    private _2748.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2751Test.java b/src/test/java/com/fishercoder/thirdthousand/_2751Test.java
index 1d1aab808d..11a97e4599 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2751Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2751Test.java
@@ -9,7 +9,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2751Test {
-    private static _2751.Solution1 solution1;
+    private _2751.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2760Test.java b/src/test/java/com/fishercoder/thirdthousand/_2760Test.java
index dac0d46f00..8a0e40530c 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2760Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2760Test.java
@@ -8,7 +8,7 @@
 
 
 public class _2760Test {
-    private static _2760.Solution1 solution1;
+    private _2760.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2765Test.java b/src/test/java/com/fishercoder/thirdthousand/_2765Test.java
index f7bd2155d3..497af209d6 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2765Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2765Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2765Test {
-    private static _2765.Solution1 solution1;
+    private _2765.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2788Test.java b/src/test/java/com/fishercoder/thirdthousand/_2788Test.java
index 00eb55db25..28c172085a 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2788Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2788Test.java
@@ -9,7 +9,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2788Test {
-    private static _2788.Solution1 solution1;
+    private _2788.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2839Test.java b/src/test/java/com/fishercoder/thirdthousand/_2839Test.java
index 1fbbb2d267..799b6c4895 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2839Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2839Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class _2839Test {
-    private static _2839.Solution1 solution1;
+    private _2839.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2843Test.java b/src/test/java/com/fishercoder/thirdthousand/_2843Test.java
index 27b828436a..6d923a5b43 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2843Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2843Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2843Test {
-    private static _2843.Solution1 solution1;
+    private _2843.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2848Test.java b/src/test/java/com/fishercoder/thirdthousand/_2848Test.java
index 2217fa7a7f..d77862904a 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2848Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2848Test.java
@@ -9,7 +9,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2848Test {
-    private static _2848.Solution1 solution1;
+    private _2848.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2855Test.java b/src/test/java/com/fishercoder/thirdthousand/_2855Test.java
index a78c498e08..d9a956900a 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2855Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2855Test.java
@@ -9,7 +9,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2855Test {
-    private static _2855.Solution1 solution1;
+    private _2855.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2900Test.java b/src/test/java/com/fishercoder/thirdthousand/_2900Test.java
index 7f99d554e9..9cc9df63a6 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2900Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2900Test.java
@@ -9,7 +9,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2900Test {
-    private static _2900.Solution1 solution1;
+    private _2900.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2913Test.java b/src/test/java/com/fishercoder/thirdthousand/_2913Test.java
index f85260ad24..c37bc67837 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2913Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2913Test.java
@@ -9,7 +9,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2913Test {
-    private static _2913.Solution1 solution1;
+    private _2913.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2917Test.java b/src/test/java/com/fishercoder/thirdthousand/_2917Test.java
index cf4025b8f4..7381ab1be6 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2917Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2917Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2917Test {
-    private static _2917.Solution1 solution1;
+    private _2917.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2928Test.java b/src/test/java/com/fishercoder/thirdthousand/_2928Test.java
index 895d9e0fad..b21b85425f 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2928Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2928Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2928Test {
-    private static _2928.Solution1 solution1;
+    private _2928.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2937Test.java b/src/test/java/com/fishercoder/thirdthousand/_2937Test.java
index 0d34b90f63..36a534c458 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2937Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2937Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2937Test {
-    private static _2937.Solution1 solution1;
+    private _2937.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2946Test.java b/src/test/java/com/fishercoder/thirdthousand/_2946Test.java
index b8cd15f23f..fec790fef3 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2946Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2946Test.java
@@ -8,7 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class _2946Test {
-    private static _2946.Solution1 solution1;
+    private _2946.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2970Test.java b/src/test/java/com/fishercoder/thirdthousand/_2970Test.java
index 546760ebcb..f144f70460 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2970Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2970Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2970Test {
-    private static _2970.Solution1 solution1;
+    private _2970.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2976Test.java b/src/test/java/com/fishercoder/thirdthousand/_2976Test.java
index 3418129496..4c5cad040d 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2976Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2976Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2976Test {
-    private static _2976.Solution1 solution1;
+    private _2976.Solution1 solution1;
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/com/fishercoder/thirdthousand/_2996Test.java b/src/test/java/com/fishercoder/thirdthousand/_2996Test.java
index 7d1fc8f8e6..c01827aed1 100644
--- a/src/test/java/com/fishercoder/thirdthousand/_2996Test.java
+++ b/src/test/java/com/fishercoder/thirdthousand/_2996Test.java
@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _2996Test {
-    private static _2996.Solution1 solution1;
+    private _2996.Solution1 solution1;
 
     @BeforeEach
     public void setup() {