diff --git a/core-java/src/main/java/com/baeldung/string/StringToCharStream.java b/core-java/src/main/java/com/baeldung/string/StringToCharStream.java
index 06a3ca6a63..6c2e38a546 100644
--- a/core-java/src/main/java/com/baeldung/string/StringToCharStream.java
+++ b/core-java/src/main/java/com/baeldung/string/StringToCharStream.java
@@ -28,6 +28,23 @@ public class StringToCharStream {
 
     }
 
+    public static IntStream getIntStreamFromCodePoints(String test) {
+        return test.codePoints();
+    }
+
+    public static IntStream getIntStreamFromChars(String test) {
+        return test.chars();
+    }
+
+    public static Stream<Character> mapIntStreamToCharStream(IntStream intStream) {
+        return intStream.mapToObj(c -> (char) c);
+    }
+
+    public static Stream<String> mapIntStreamToStringStream(IntStream intStream) {
+        return intStream.mapToObj(c -> String.valueOf((char) c));
+    }
+
+
     public static void main(String[] args) {
 
         new StringToCharStream();
diff --git a/core-java/src/test/java/com/baeldung/string/StringToCharStreamUnitTest.java b/core-java/src/test/java/com/baeldung/string/StringToCharStreamUnitTest.java
index 52e38ff898..eeb3051fc1 100644
--- a/core-java/src/test/java/com/baeldung/string/StringToCharStreamUnitTest.java
+++ b/core-java/src/test/java/com/baeldung/string/StringToCharStreamUnitTest.java
@@ -8,27 +8,26 @@ import java.util.stream.Stream;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 
 public class StringToCharStreamUnitTest {
 
-    private String testString = "Tests";
 
     @Test
     public void givenTestString_whenChars_thenReturnIntStream() {
-
-        assertThat(testString.chars(), instanceOf(IntStream.class));
+        assertThat(StringToCharStream.getIntStreamFromChars("test"), instanceOf(IntStream.class));
     }
 
     @Test
     public void givenTestString_whenCodePoints_thenReturnIntStream() {
-        assertThat(testString.codePoints(), instanceOf(IntStream.class));
+        assertThat(StringToCharStream.getIntStreamFromCodePoints("test"), instanceOf(IntStream.class));
     }
 
     @Test
     public void givenIntStream_whenMapToObj_thenReturnCharacterStream() {
-        Stream<Character> characterStream = testString.chars().mapToObj(c -> (char) c);
-        Stream<Character> characterStream1 = testString.codePoints().mapToObj(c -> (char) c);
+        Stream<Character> characterStream
+          = StringToCharStream.mapIntStreamToCharStream(StringToCharStream.getIntStreamFromChars("test"));
+        Stream<Character> characterStream1
+          = StringToCharStream.mapIntStreamToCharStream(StringToCharStream.getIntStreamFromCodePoints("test"));
         assertNotNull("IntStream returned by chars() did not map to Stream<Character>", characterStream);
         assertNotNull("IntStream returned by codePoints() did not map to Stream<Character>", characterStream1);
     }
@@ -36,7 +35,7 @@ public class StringToCharStreamUnitTest {
     @Test
     public void givenIntStream_whenMapToObj_thenReturnStringStream() {
         Stream<String> stringStream
-          = testString.codePoints().mapToObj(c -> String.valueOf((char) c));
+          = StringToCharStream.mapIntStreamToStringStream(StringToCharStream.getIntStreamFromCodePoints("test"));
         assertNotNull(stringStream);
     }
 
diff --git a/[B[A[B[B[B[Bssc b/[B[A[B[B[B[Bssc
new file mode 100644
index 0000000000..e69de29bb2