diff --git a/libraries/src/main/java/com/baeldung/chronicle/queue/ChronicleQueue.java b/libraries/src/main/java/com/baeldung/chronicle/queue/ChronicleQueue.java
index b7770e0b78..f6bd25c0fe 100644
--- a/libraries/src/main/java/com/baeldung/chronicle/queue/ChronicleQueue.java
+++ b/libraries/src/main/java/com/baeldung/chronicle/queue/ChronicleQueue.java
@@ -7,7 +7,7 @@ import net.openhft.chronicle.ExcerptAppender;
 
 public class ChronicleQueue {
 
-    public static void writeToQueue(
+    static void writeToQueue(
       Chronicle chronicle, String stringValue, int intValue, long longValue, double doubleValue) 
         throws IOException {
         ExcerptAppender appender = chronicle.createAppender();
diff --git a/libraries/src/test/java/com/baeldung/awaitility/AsyncServiceUnitTest.java b/libraries/src/test/java/com/baeldung/awaitility/AsyncServiceLongRunningUnitTest.java
similarity index 86%
rename from libraries/src/test/java/com/baeldung/awaitility/AsyncServiceUnitTest.java
rename to libraries/src/test/java/com/baeldung/awaitility/AsyncServiceLongRunningUnitTest.java
index 43537965f8..d17a7dcf1b 100644
--- a/libraries/src/test/java/com/baeldung/awaitility/AsyncServiceUnitTest.java
+++ b/libraries/src/test/java/com/baeldung/awaitility/AsyncServiceLongRunningUnitTest.java
@@ -11,10 +11,13 @@ import java.util.concurrent.TimeUnit;
 import static org.awaitility.Awaitility.await;
 import static org.awaitility.Awaitility.fieldIn;
 import static org.awaitility.Awaitility.given;
+import static org.awaitility.Awaitility.setDefaultPollDelay;
+import static org.awaitility.Awaitility.setDefaultPollInterval;
+import static org.awaitility.Awaitility.setDefaultTimeout;
 import static org.awaitility.proxy.AwaitilityClassProxy.to;
 import static org.hamcrest.Matchers.equalTo;
 
-public class AsyncServiceUnitTest {
+public class AsyncServiceLongRunningUnitTest {
     private AsyncService asyncService;
 
     @Before
@@ -41,9 +44,9 @@ public class AsyncServiceUnitTest {
 
     @Test
     public void givenAsyncService_whenInitialize_thenInitOccurs_withDefualts() {
-        Awaitility.setDefaultPollInterval(10, TimeUnit.MILLISECONDS);
-        Awaitility.setDefaultPollDelay(Duration.ZERO);
-        Awaitility.setDefaultTimeout(Duration.ONE_MINUTE);
+        setDefaultPollInterval(10, TimeUnit.MILLISECONDS);
+        setDefaultPollDelay(Duration.ZERO);
+        setDefaultTimeout(Duration.ONE_MINUTE);
 
         asyncService.initialize();
         await().until(asyncService::isInitialized);
diff --git a/libraries/src/test/java/com/baeldung/chronicle/queue/ChronicleQueueTest.java b/libraries/src/test/java/com/baeldung/chronicle/queue/ChronicleQueueIntegrationTest.java
similarity index 96%
rename from libraries/src/test/java/com/baeldung/chronicle/queue/ChronicleQueueTest.java
rename to libraries/src/test/java/com/baeldung/chronicle/queue/ChronicleQueueIntegrationTest.java
index e64aaed544..9c0a0ac910 100644
--- a/libraries/src/test/java/com/baeldung/chronicle/queue/ChronicleQueueTest.java
+++ b/libraries/src/test/java/com/baeldung/chronicle/queue/ChronicleQueueIntegrationTest.java
@@ -13,7 +13,7 @@ import net.openhft.chronicle.ChronicleQueueBuilder;
 import net.openhft.chronicle.ExcerptTailer;
 import net.openhft.chronicle.tools.ChronicleTools;
 
-public class ChronicleQueueTest {
+public class ChronicleQueueIntegrationTest {
     
     @Test
     public void givenSetOfValues_whenWriteToQueue_thenWriteSuccesfully() throws IOException {
diff --git a/libraries/src/test/java/com/baeldung/hll/HLLUnitTest.java b/libraries/src/test/java/com/baeldung/hll/HLLLongRunningUnitTest.java
similarity index 98%
rename from libraries/src/test/java/com/baeldung/hll/HLLUnitTest.java
rename to libraries/src/test/java/com/baeldung/hll/HLLLongRunningUnitTest.java
index e208add3c8..5ecd4442d8 100644
--- a/libraries/src/test/java/com/baeldung/hll/HLLUnitTest.java
+++ b/libraries/src/test/java/com/baeldung/hll/HLLLongRunningUnitTest.java
@@ -11,7 +11,7 @@ import java.util.stream.LongStream;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 
-public class HLLUnitTest {
+public class HLLLongRunningUnitTest {
 
     @Test
     public void givenHLL_whenAddHugeAmountOfNumbers_thenShouldReturnEstimatedCardinality() {