diff --git a/build.gradle b/build.gradle
index 242b3e28..1417f368 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,12 +5,16 @@ plugins {
 group 'org.example'
 version '1.0-SNAPSHOT'
 
-sourceCompatibility = 1.8
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testImplementation platform('org.junit:junit-bom:5.10.0')
+    testImplementation 'org.junit.jupiter:junit-jupiter'
 }
+
+test {
+    useJUnitPlatform()
+}
\ No newline at end of file
diff --git a/src/main/java/powerpackage/PowerFinder.java b/src/main/java/powerpackage/PowerFinder.java
new file mode 100644
index 00000000..d9feaec0
--- /dev/null
+++ b/src/main/java/powerpackage/PowerFinder.java
@@ -0,0 +1,13 @@
+package powerpackage;
+
+
+/* 2^3 = 8 */
+public class PowerFinder {
+    public int getPowerOf(int base, int exponent) {
+        int power = 1;
+        for (int expo = 0; expo < exponent; expo++) {
+            power *= base;
+        }
+        return power;
+    }
+}
diff --git a/src/main/java/powerpackage/powerfinder.java b/src/main/java/powerpackage/powerfinder.java
deleted file mode 100644
index dab562d9..00000000
--- a/src/main/java/powerpackage/powerfinder.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package powerpackage;
-
-public class powerfinder {
-    public static int OF(int xyz, int pqr) {
-        int p = 1;
-        for (int i = 0; i<pqr; i++) {
-            p *= xyz;
-        }
-        return p;
-    }
-}
diff --git a/src/test/java/powerpackage/PowerFinderTest.java b/src/test/java/powerpackage/PowerFinderTest.java
new file mode 100644
index 00000000..478beafa
--- /dev/null
+++ b/src/test/java/powerpackage/PowerFinderTest.java
@@ -0,0 +1,40 @@
+package powerpackage;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class PowerFinderTest {
+    @Test
+    void shouldReturnOneWhenOneRaisedToOne() {
+        PowerFinder powerFinder = new PowerFinder();
+        int actualPower = powerFinder.getPowerOf(1, 1);
+        int expectedPower = 1;
+        assertEquals(expectedPower, actualPower);
+    }
+
+    @Test
+    void shouldReturnTwoWhenTwoRaisedToOme() {
+        PowerFinder powerFinder = new PowerFinder();
+        int actualPower = powerFinder.getPowerOf(2, 1);
+        int expectedPower = 2;
+        assertEquals(expectedPower, actualPower);
+    }
+
+    @Test
+    void shouldReturnFourWhenTwoRaisedToTwo() {
+        PowerFinder powerFinder = new PowerFinder();
+        int actualPower = powerFinder.getPowerOf(2, 2);
+        int expectedPower = 2 * 2;
+        assertEquals(expectedPower, actualPower);
+    }
+
+    @Test
+    void shouldReturnOneWhenTwoRaisedToThree() {
+        PowerFinder powerFinder = new PowerFinder();
+        int actualPower = powerFinder.getPowerOf(3, 2);
+        int expectedPower = 3 * 3;
+        assertEquals(expectedPower, actualPower);
+    }
+
+}
diff --git a/src/test/powertest.java b/src/test/powertest.java
deleted file mode 100644
index a74fb0d2..00000000
--- a/src/test/powertest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package powerpackage;
-
-
-import org.junit.Test;
-
-public class powertest {
-    @Test
-    public void one_raised_to_one_is_onew() {
-        assert powerfinder.OF(1,1) == 1;
-    }
-
-    @Test
-    public void twoRaised_to_one_is_2() {
-        assert powerfinder.OF(2,1) == 2;
-    }
-
-    @Test
-    public void two_power_2_is_4() {
-        assert powerfinder.OF(2, 2) == 4;
-    }
-
-    @Test
-    public void power_of_2_and_3_Is_SIX() {
-        assert powerfinder.OF(3, 2) == 3*3;
-    }
-}