diff --git a/core-java/src/test/java/org/baeldung/java/CoreJavaIoUnitTest.java b/core-java/src/test/java/org/baeldung/java/io/JavaInputStreamToXUnitTest.java
similarity index 98%
rename from core-java/src/test/java/org/baeldung/java/CoreJavaIoUnitTest.java
rename to core-java/src/test/java/org/baeldung/java/io/JavaInputStreamToXUnitTest.java
index d860d1ab42..579d4b3a72 100644
--- a/core-java/src/test/java/org/baeldung/java/CoreJavaIoUnitTest.java
+++ b/core-java/src/test/java/org/baeldung/java/io/JavaInputStreamToXUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.java;
+package org.baeldung.java.io;
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 import static org.hamcrest.Matchers.equalTo;
@@ -25,7 +25,7 @@ import com.google.common.base.Charsets;
 import com.google.common.io.CharStreams;
 import com.google.common.io.InputSupplier;
 
-public class CoreJavaIoUnitTest {
+public class JavaInputStreamToXUnitTest {
     protected final Logger logger = LoggerFactory.getLogger(getClass());
     private static final int DEFAULT_SIZE = 150000000;
 
diff --git a/core-java/src/test/java/org/baeldung/java/io/JavaXToInputStreamUnitTest.java b/core-java/src/test/java/org/baeldung/java/io/JavaXToInputStreamUnitTest.java
new file mode 100644
index 0000000000..c5b35bc9f5
--- /dev/null
+++ b/core-java/src/test/java/org/baeldung/java/io/JavaXToInputStreamUnitTest.java
@@ -0,0 +1,41 @@
+package org.baeldung.java.io;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.io.CharSource;
+
+@SuppressWarnings("unused")
+public class JavaXToInputStreamUnitTest {
+    protected final Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Test
+    public void givenUsingPlainJava_whenConvertingStringToInputStream_thenCorrect() throws IOException {
+        final String initialString = "text";
+        final InputStream targetStream = new ByteArrayInputStream(initialString.getBytes());
+        final byte[] buffer = new byte[targetStream.available()];
+        targetStream.read(buffer);
+        final String targetString = new String(buffer);
+    }
+
+    @Test
+    public void givenUsingGuava_whenConvertingStringToInputStream_thenCorrect() throws IOException {
+        final String initialString = "text";
+        final CharSource source = CharSource.wrap(initialString);
+        final Reader targetStream = source.openStream();
+    }
+
+    @Test
+    public void givenUsingCommonsIO_whenConvertingStringToInputStream_thenCorrect() throws IOException {
+        final String initialString = "text";
+        final InputStream targetStream = IOUtils.toInputStream(initialString);
+    }
+
+}
diff --git a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientConnectionManagementTest.java b/httpclient/src/test/java/org/baeldung/httpclient/HttpClientConnectionManagementTest.java
index 3a54dfb9ec..5096725ece 100644
--- a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientConnectionManagementTest.java
+++ b/httpclient/src/test/java/org/baeldung/httpclient/HttpClientConnectionManagementTest.java
@@ -1,5 +1,9 @@
 package org.baeldung.httpclient;
 
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+
+import org.apache.http.HttpException;
 import org.apache.http.HttpHost;
 import org.apache.http.client.protocol.HttpClientContext;
 import org.apache.http.conn.ConnectionRequest;
@@ -7,16 +11,19 @@ import org.apache.http.conn.routing.HttpRoute;
 import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
 import org.junit.Test;
 
+@SuppressWarnings("unused")
 public class HttpClientConnectionManagementTest {
 
     // tests
 
     @Test
-    public final void whenLowLevelConnectionIsEstablished_thenNoExceptions() {
+    public final void whenLowLevelConnectionIsEstablished_thenNoExceptions() throws IOException, HttpException, InterruptedException, ExecutionException {
         final HttpClientContext context = HttpClientContext.create();
         final BasicHttpClientConnectionManager connManager = new BasicHttpClientConnectionManager();
         final HttpRoute route = new HttpRoute(new HttpHost("localhost", 80));
         final ConnectionRequest connRequest = connManager.requestConnection(route, null);
+
+        connManager.shutdown();
     }
 
 }