diff --git a/src/main/java/com/rampatra/java8/Junit/JUnit b/src/main/java/com/rampatra/java8/Junit/JUnit
new file mode 100644
index 00000000..10fe3931
--- /dev/null
+++ b/src/main/java/com/rampatra/java8/Junit/JUnit
@@ -0,0 +1 @@
+This is for JUnit Testing
diff --git a/src/main/java/com/rampatra/java8/Junit/TheTimeInWorldJUnit.java b/src/main/java/com/rampatra/java8/Junit/TheTimeInWorldJUnit.java
new file mode 100644
index 00000000..73cdf843
--- /dev/null
+++ b/src/main/java/com/rampatra/java8/Junit/TheTimeInWorldJUnit.java
@@ -0,0 +1,15 @@
+import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class MainTest {
+    @Test
+    public void getTime () {
+        Main main = new Main();
+        String actualResult = main.getTime();
+        String expectedResult = "twenty minutes past four";
+        Assertions.assertEquals(expectedResult, actualResult);
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/rampatra/strings/Junit/Junit b/src/main/java/com/rampatra/strings/Junit/Junit
new file mode 100644
index 00000000..061db52c
--- /dev/null
+++ b/src/main/java/com/rampatra/strings/Junit/Junit
@@ -0,0 +1 @@
+Create Junit Folder
diff --git a/src/main/java/com/rampatra/strings/Junit/RemoveExtraSpacesTest.java b/src/main/java/com/rampatra/strings/Junit/RemoveExtraSpacesTest.java
new file mode 100644
index 00000000..3c62a0cb
--- /dev/null
+++ b/src/main/java/com/rampatra/strings/Junit/RemoveExtraSpacesTest.java
@@ -0,0 +1,40 @@
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class RemoveExtraSpacesTest {
+
+    String stringTest1 = "Test with no extra space";
+    String stringTest2 = "Test with extra   space";
+    String stringTest3 = "  Test with extra space at the beginning";
+    String stringTest4 = "Test with extra space at the end    ";
+
+    @Test
+    public void RemoveSpaceWithNoExtraSpace () {
+        String expectedResult = "Test with no extra space";
+        String actualResult = Main.removeExtraSpaces(stringTest1);
+        assertEquals(expectedResult, actualResult);
+    }
+
+    @Test
+    public void RemoveSpaceWithExtraSpace () {
+        String expectedResult = "Test with extra space";
+        String actualResult = Main.removeExtraSpaces(stringTest2);
+        assertEquals(expectedResult, actualResult);
+    }
+
+    @Test
+    public void RemoveSpaceWithSpaceAtBeginning () {
+        String expectedResult = "Test with extra space at the beginning";
+        String actualResult = Main.removeExtraSpaces(stringTest3);
+        assertEquals(expectedResult, actualResult);
+    }
+
+    @Test
+    public void RemoveSpaceWithSpaceAtEnd () {
+        String expectedResult = "Test with extra space at the end";
+        String actualResult = Main.removeExtraSpaces(stringTest4);
+        assertEquals(expectedResult, actualResult);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/rampatra/strings/RemoveExtraSpaces.java b/src/main/java/com/rampatra/strings/RemoveExtraSpaces.java
index 3c5b6954..dbe2ac5d 100644
--- a/src/main/java/com/rampatra/strings/RemoveExtraSpaces.java
+++ b/src/main/java/com/rampatra/strings/RemoveExtraSpaces.java
@@ -49,7 +49,10 @@ public static String removeExtraSpaces(String s) {
             }
         }
 
-        return String.valueOf(Arrays.copyOf(c, j));
+        String stringAfterRemove = String.valueOf(Arrays.copyOf(c, j));
+        //Remove Extra Space at the beginning and the end
+        String removeBegAndEnd = stringAfterRemove.trim();
+        return removeBegAndEnd;
     }
 
     public static void main(String[] args) {