diff --git a/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/inputstream/InputStreamUnitTest.java b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/inputstream/InputStreamUnitTest.java
index 6488e91c3e..7fa5d760a5 100644
--- a/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/inputstream/InputStreamUnitTest.java
+++ b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/inputstream/InputStreamUnitTest.java
@@ -17,9 +17,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
+
 public class InputStreamUnitTest {
     @Test
     public void givenAStringWrittenToFile_whenReadWithFileInputStream_thenItShouldExitsInTheInputStream(@TempDir Path tempDir) throws IOException {
@@ -41,14 +41,9 @@ public class InputStreamUnitTest {
         String fileAbsolutePath = sampleOut.toFile()
             .getAbsolutePath();
         try (FileInputStream fis = new FileInputStream(fileAbsolutePath)) {
-            int content;
             int availableBytes = fis.available();
-            Assert.assertTrue(availableBytes > 0);
-            StringBuilder actualReadText = new StringBuilder();
-            while ((content = fis.read()) != -1) {
-                actualReadText.append((char) content);
-            }
-            assertThat(actualReadText.toString()).contains(expectedText);
+            assertThat(availableBytes > 0);
+            assertThat(readString(fis)).contains(expectedText);
         }
     }
 
@@ -59,6 +54,7 @@ public class InputStreamUnitTest {
             assertThat(readString(bais)).isEqualTo("hello");
         }
     }
+
     @Test
     public void givenKeyValuePairsWrittenInAFile_whenPassedInOutputStreams_thenThePairsShouldExistsInObjectInputStreams(@TempDir Path tempDir) throws IOException, ClassNotFoundException {
         Path sampleOut = tempDir.resolve("sample-out.txt");
@@ -66,15 +62,15 @@ public class InputStreamUnitTest {
         //Serialize a Hashmap then write it into a file.
         Map<String, String> kv = new HashMap<>();
         try (ObjectOutputStream objectOutStream = new ObjectOutputStream(new FileOutputStream(textFile))) {
-                kv.put("baseURL", "baeldung.com");
-                kv.put("apiKey", "this_is_a_test_key");
-                objectOutStream.writeObject(kv);
+            kv.put("baseURL", "baeldung.com");
+            kv.put("apiKey", "this_is_a_test_key");
+            objectOutStream.writeObject(kv);
         }
         //Deserialize the contents of a file then transform it back into a Hashmap
         try (ObjectInputStream input = new ObjectInputStream(new FileInputStream(textFile))) {
-                HashMap<String, String> inputKv = (HashMap<String, String>) input.readObject();
-                assertThat(kv.get("baseURL")).isEqualTo( inputKv.get("baseURL"));
-                assertThat(kv.get("apiKey")).isEqualTo( inputKv.get("apiKey"));
+            HashMap<String, String> inputKv = (HashMap<String, String>) input.readObject();
+            assertThat(kv.get("baseURL")).isEqualTo(inputKv.get("baseURL"));
+            assertThat(kv.get("apiKey")).isEqualTo(inputKv.get("apiKey"));
         }
     }
 
diff --git a/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/inputstreamreader/InputStreamReaderUnitTest.java b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/inputstreamreader/InputStreamReaderUnitTest.java
index 2dfcc4f9e7..358ed5dea0 100644
--- a/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/inputstreamreader/InputStreamReaderUnitTest.java
+++ b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/inputstreamreader/InputStreamReaderUnitTest.java
@@ -14,10 +14,10 @@ import java.util.List;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
+
 public class InputStreamReaderUnitTest {
     @Test
     public void givenAStringWrittenToAFile_whenReadByInputStreamReader_thenShouldMatchWhenRead(@TempDir Path tempDir) throws IOException {
-        boolean isMatched = false;
         String sampleTxt = "Good day. This is just a test. Good bye.";
         Path sampleOut = tempDir.resolve("sample-out.txt");
         List<String> lines = Arrays.asList(sampleTxt);
@@ -25,6 +25,7 @@ public class InputStreamReaderUnitTest {
         String absolutePath = String.valueOf(sampleOut.toAbsolutePath());
         try (BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(absolutePath), StandardCharsets.UTF_8))) {
             String ln;
+            boolean isMatched = false;
             while ((ln = br.readLine()) != null) {
                 if (ln.contains(sampleTxt)) {
                     isMatched = true;