diff --git a/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForDosVisitorTest.java b/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForDosVisitorTest.java
index 7697fc367..c6aec8bef 100644
--- a/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForDosVisitorTest.java
+++ b/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForDosVisitorTest.java
@@ -74,7 +74,7 @@ class ConfigureForDosVisitorTest {
 
   @BeforeEach
   @AfterEach
-  public void clearLoggers() {
+  void clearLoggers() {
     TestLoggerFactory.clear();
   }
 }
diff --git a/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForUnixVisitorTest.java b/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForUnixVisitorTest.java
index 4e887b222..587b82911 100644
--- a/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForUnixVisitorTest.java
+++ b/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForUnixVisitorTest.java
@@ -44,7 +44,7 @@ class ConfigureForUnixVisitorTest {
 
   @BeforeEach
   @AfterEach
-  public void clearLoggers() {
+  void clearLoggers() {
     TestLoggerFactory.clear();
   }
 
diff --git a/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java b/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java
index 1aa5f90c8..5d5c2a081 100644
--- a/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java
+++ b/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java
@@ -48,7 +48,7 @@ class AdapterPatternTest {
    * This method runs before the test execution and sets the bean objects in the beans Map.
    */
   @BeforeEach
-  public void setup() {
+  void setup() {
     beans = new HashMap<>();
 
     var fishingBoatAdapter = spy(new FishingBoatAdapter());
diff --git a/aggregator-microservices/aggregator-service/src/test/java/com/iluwatar/aggregator/microservices/AggregatorTest.java b/aggregator-microservices/aggregator-service/src/test/java/com/iluwatar/aggregator/microservices/AggregatorTest.java
index 5630a18d1..2ac246d9f 100644
--- a/aggregator-microservices/aggregator-service/src/test/java/com/iluwatar/aggregator/microservices/AggregatorTest.java
+++ b/aggregator-microservices/aggregator-service/src/test/java/com/iluwatar/aggregator/microservices/AggregatorTest.java
@@ -48,7 +48,7 @@ class AggregatorTest {
   private ProductInventoryClient inventoryClient;
 
   @BeforeEach
-  public void setup() {
+  void setup() {
     MockitoAnnotations.openMocks(this);
   }
 
diff --git a/api-gateway/api-gateway-service/src/test/java/com/iluwatar/api/gateway/ApiGatewayTest.java b/api-gateway/api-gateway-service/src/test/java/com/iluwatar/api/gateway/ApiGatewayTest.java
index 0ae43e8dd..0f1fa938e 100644
--- a/api-gateway/api-gateway-service/src/test/java/com/iluwatar/api/gateway/ApiGatewayTest.java
+++ b/api-gateway/api-gateway-service/src/test/java/com/iluwatar/api/gateway/ApiGatewayTest.java
@@ -48,7 +48,7 @@ class ApiGatewayTest {
   private PriceClient priceClient;
 
   @BeforeEach
-  public void setup() {
+  void setup() {
     MockitoAnnotations.openMocks(this);
   }
 
diff --git a/business-delegate/src/test/java/com/iluwatar/business/delegate/BusinessDelegateTest.java b/business-delegate/src/test/java/com/iluwatar/business/delegate/BusinessDelegateTest.java
index 351001ceb..8e8c8eddc 100644
--- a/business-delegate/src/test/java/com/iluwatar/business/delegate/BusinessDelegateTest.java
+++ b/business-delegate/src/test/java/com/iluwatar/business/delegate/BusinessDelegateTest.java
@@ -49,7 +49,7 @@ class BusinessDelegateTest {
    * execution of every test.
    */
   @BeforeEach
-  public void setup() {
+  void setup() {
     netflixService = spy(new NetflixService());
     youTubeService = spy(new YouTubeService());
 
diff --git a/caching/src/test/java/com/iluwatar/caching/CachingTest.java b/caching/src/test/java/com/iluwatar/caching/CachingTest.java
index 41c220420..0bcb83897 100644
--- a/caching/src/test/java/com/iluwatar/caching/CachingTest.java
+++ b/caching/src/test/java/com/iluwatar/caching/CachingTest.java
@@ -39,7 +39,7 @@ class CachingTest {
    * Setup of application test includes: initializing DB connection and cache size/capacity.
    */
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     // VirtualDB (instead of MongoDB) was used in running the JUnit tests
     // to avoid Maven compilation errors. Set flag to true to run the
     // tests with MongoDB (provided that MongoDB is installed and socket
diff --git a/callback/src/test/java/com/iluwatar/callback/CallbackTest.java b/callback/src/test/java/com/iluwatar/callback/CallbackTest.java
index 83a5aad5a..d8dab98e6 100644
--- a/callback/src/test/java/com/iluwatar/callback/CallbackTest.java
+++ b/callback/src/test/java/com/iluwatar/callback/CallbackTest.java
@@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test;
  * <p>
  * Could be done with mock objects as well where the call method call is verified.
  */
-public class CallbackTest {
+class CallbackTest {
 
   private Integer callingCount = 0;
 
diff --git a/circuit-breaker/src/test/java/com/iluwatar/circuitbreaker/AppTest.java b/circuit-breaker/src/test/java/com/iluwatar/circuitbreaker/AppTest.java
index b5aeb2ac9..8502ce0af 100644
--- a/circuit-breaker/src/test/java/com/iluwatar/circuitbreaker/AppTest.java
+++ b/circuit-breaker/src/test/java/com/iluwatar/circuitbreaker/AppTest.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
 /**
  * App Test showing usage of circuit breaker.
  */
-public class AppTest {
+class AppTest {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(AppTest.class);
 
@@ -60,7 +60,7 @@ public class AppTest {
    * and retry time period of 2 seconds.
    */
   @BeforeEach
-  public void setupCircuitBreakers() {
+  void setupCircuitBreakers() {
     var delayedService = new DelayedRemoteService(System.nanoTime(), STARTUP_DELAY);
     //Set the circuit Breaker parameters
     delayedServiceCircuitBreaker = new DefaultCircuitBreaker(delayedService, 3000,
@@ -78,7 +78,7 @@ public class AppTest {
   }
 
   @Test
-  public void testFailure_OpenStateTransition() {
+  void testFailure_OpenStateTransition() {
     //Calling delayed service, which will be unhealthy till 4 seconds
     assertEquals("Delayed service is down", monitoringService.delayedServiceResponse());
     //As failure threshold is "1", the circuit breaker is changed to OPEN
@@ -93,7 +93,7 @@ public class AppTest {
   }
 
   @Test
-  public void testFailure_HalfOpenStateTransition() {
+  void testFailure_HalfOpenStateTransition() {
     //Calling delayed service, which will be unhealthy till 4 seconds
     assertEquals("Delayed service is down", monitoringService.delayedServiceResponse());
     //As failure threshold is "1", the circuit breaker is changed to OPEN
@@ -112,7 +112,7 @@ public class AppTest {
   }
 
   @Test
-  public void testRecovery_ClosedStateTransition() {
+  void testRecovery_ClosedStateTransition() {
     //Calling delayed service, which will be unhealthy till 4 seconds
     assertEquals("Delayed service is down", monitoringService.delayedServiceResponse());
     //As failure threshold is "1", the circuit breaker is changed to OPEN
diff --git a/circuit-breaker/src/test/java/com/iluwatar/circuitbreaker/DefaultCircuitBreakerTest.java b/circuit-breaker/src/test/java/com/iluwatar/circuitbreaker/DefaultCircuitBreakerTest.java
index 2e19456a5..817a1e7d0 100644
--- a/circuit-breaker/src/test/java/com/iluwatar/circuitbreaker/DefaultCircuitBreakerTest.java
+++ b/circuit-breaker/src/test/java/com/iluwatar/circuitbreaker/DefaultCircuitBreakerTest.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Circuit Breaker test
  */
-public class DefaultCircuitBreakerTest {
+class DefaultCircuitBreakerTest {
 
   //long timeout, int failureThreshold, long retryTimePeriod
   @Test
diff --git a/circuit-breaker/src/test/java/com/iluwatar/circuitbreaker/DelayedRemoteServiceTest.java b/circuit-breaker/src/test/java/com/iluwatar/circuitbreaker/DelayedRemoteServiceTest.java
index 23215da88..5fe3cdc48 100644
--- a/circuit-breaker/src/test/java/com/iluwatar/circuitbreaker/DelayedRemoteServiceTest.java
+++ b/circuit-breaker/src/test/java/com/iluwatar/circuitbreaker/DelayedRemoteServiceTest.java
@@ -53,7 +53,7 @@ class DelayedRemoteServiceTest {
    * @throws RemoteServiceException
    */
   @Test
-  public void testParameterizedConstructor() throws RemoteServiceException {
+  void testParameterizedConstructor() throws RemoteServiceException {
       var obj = new DelayedRemoteService(System.nanoTime()-2000*1000*1000,1);
       assertEquals("Delayed service is working",obj.call());
   }
diff --git a/cloud-claim-check-pattern/call-usage-app/src/test/java/com/iluwatar/claimcheckpattern/consumer/callcostprocessor/functions/UsageCostProcessorFunctionTest.java b/cloud-claim-check-pattern/call-usage-app/src/test/java/com/iluwatar/claimcheckpattern/consumer/callcostprocessor/functions/UsageCostProcessorFunctionTest.java
index 3beb01ea4..fc1683768 100644
--- a/cloud-claim-check-pattern/call-usage-app/src/test/java/com/iluwatar/claimcheckpattern/consumer/callcostprocessor/functions/UsageCostProcessorFunctionTest.java
+++ b/cloud-claim-check-pattern/call-usage-app/src/test/java/com/iluwatar/claimcheckpattern/consumer/callcostprocessor/functions/UsageCostProcessorFunctionTest.java
@@ -58,7 +58,7 @@ import static org.mockito.Mockito.*;
  * Unit test for Function class.
  */
 @ExtendWith(MockitoExtension.class)
-public class UsageCostProcessorFunctionTest {
+class UsageCostProcessorFunctionTest {
 
     @Mock
     MessageHandlerUtility<UsageDetail> mockMessageHandlerUtilityForUsageADetail;
@@ -74,7 +74,7 @@ public class UsageCostProcessorFunctionTest {
     UsageCostProcessorFunction usageCostProcessorFunction;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         var messageBodyUsageDetail = new MessageBody<UsageDetail>();
         var usageDetailsList = new ArrayList<UsageDetail>();
 
@@ -122,7 +122,7 @@ public class UsageCostProcessorFunctionTest {
      * Unit test for HttpTriggerJava method.
      */
     @Test
-    public void shouldTriggerHttpAzureFunctionJavaWithSubscriptionValidationEventType() throws Exception {
+    void shouldTriggerHttpAzureFunctionJavaWithSubscriptionValidationEventType() throws Exception {
 
         // Setup
         @SuppressWarnings("unchecked")
@@ -148,7 +148,7 @@ public class UsageCostProcessorFunctionTest {
     }
 
     @Test
-    public void shouldTriggerHttpAzureFunctionJavaWithUsageDetailEventType() throws Exception {
+    void shouldTriggerHttpAzureFunctionJavaWithUsageDetailEventType() throws Exception {
         // Setup
         @SuppressWarnings("unchecked")
         final HttpRequestMessage<Optional<String>> req = mock(HttpRequestMessage.class);
diff --git a/cloud-claim-check-pattern/call-usage-app/src/test/java/com/iluwatar/claimcheckpattern/producer/calldetails/functions/UsageDetailPublisherFunctionTest.java b/cloud-claim-check-pattern/call-usage-app/src/test/java/com/iluwatar/claimcheckpattern/producer/calldetails/functions/UsageDetailPublisherFunctionTest.java
index 6533ea357..c44e23b35 100644
--- a/cloud-claim-check-pattern/call-usage-app/src/test/java/com/iluwatar/claimcheckpattern/producer/calldetails/functions/UsageDetailPublisherFunctionTest.java
+++ b/cloud-claim-check-pattern/call-usage-app/src/test/java/com/iluwatar/claimcheckpattern/producer/calldetails/functions/UsageDetailPublisherFunctionTest.java
@@ -52,7 +52,7 @@ import static org.mockito.Mockito.*;
  * Unit test for Function class.
  */
 @ExtendWith(MockitoExtension.class)
-public class UsageDetailPublisherFunctionTest {
+class UsageDetailPublisherFunctionTest {
     @Mock
     MessageHandlerUtility<UsageDetail> mockMessageHandlerUtility;
     @Mock
@@ -65,7 +65,7 @@ public class UsageDetailPublisherFunctionTest {
      * Unit test for HttpTriggerJava method.
      */
     @Test
-    public void shouldTriggerHttpAzureFunctionJavaWithSubscriptionValidationEventType() throws Exception {
+    void shouldTriggerHttpAzureFunctionJavaWithSubscriptionValidationEventType() throws Exception {
 
         // Setup
         @SuppressWarnings("unchecked")
@@ -91,7 +91,7 @@ public class UsageDetailPublisherFunctionTest {
     }
 
     @Test
-    public void shouldTriggerHttpAzureFunctionJavaWithUsageDetailEventType() throws Exception {
+    void shouldTriggerHttpAzureFunctionJavaWithUsageDetailEventType() throws Exception {
 
         // Setup
         @SuppressWarnings("unchecked")
diff --git a/cloud-claim-check-pattern/call-usage-app/src/test/java/com/iluwatar/claimcheckpattern/utility/EventHandlerUtilityTest.java b/cloud-claim-check-pattern/call-usage-app/src/test/java/com/iluwatar/claimcheckpattern/utility/EventHandlerUtilityTest.java
index 9e34ec533..69e63241f 100644
--- a/cloud-claim-check-pattern/call-usage-app/src/test/java/com/iluwatar/claimcheckpattern/utility/EventHandlerUtilityTest.java
+++ b/cloud-claim-check-pattern/call-usage-app/src/test/java/com/iluwatar/claimcheckpattern/utility/EventHandlerUtilityTest.java
@@ -40,7 +40,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-public class EventHandlerUtilityTest {
+class EventHandlerUtilityTest {
 
     @Mock
     EventGridPublisherClient<BinaryData> mockCustomEventClient;
@@ -49,7 +49,7 @@ public class EventHandlerUtilityTest {
     EventHandlerUtility<Message<UsageDetail>> eventHandlerUtility;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
 
         System.setProperty("EventGridURL", "https://www.dummyEndpoint.com/api/events");
         System.setProperty("EventGridKey", "EventGridURL");
diff --git a/cloud-claim-check-pattern/call-usage-app/src/test/java/com/iluwatar/claimcheckpattern/utility/MessageHandlerUtilityTest.java b/cloud-claim-check-pattern/call-usage-app/src/test/java/com/iluwatar/claimcheckpattern/utility/MessageHandlerUtilityTest.java
index 0230406bc..7bfc08b89 100644
--- a/cloud-claim-check-pattern/call-usage-app/src/test/java/com/iluwatar/claimcheckpattern/utility/MessageHandlerUtilityTest.java
+++ b/cloud-claim-check-pattern/call-usage-app/src/test/java/com/iluwatar/claimcheckpattern/utility/MessageHandlerUtilityTest.java
@@ -46,7 +46,7 @@ import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
-public class MessageHandlerUtilityTest {
+class MessageHandlerUtilityTest {
     @Mock
     private BlobClient mockBlobClient;
 
@@ -63,7 +63,7 @@ public class MessageHandlerUtilityTest {
     private MessageReference messageReference;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         System.setProperty("BlobStorageConnectionString", "https://www.dummyEndpoint.com/api/blobs");
 
         var messageBody = new MessageBody<UsageDetail>();
diff --git a/composite-view/src/test/java/com/iluwatar/compositeview/AppServletTest.java b/composite-view/src/test/java/com/iluwatar/compositeview/AppServletTest.java
index 37dc71394..27c829a75 100644
--- a/composite-view/src/test/java/com/iluwatar/compositeview/AppServletTest.java
+++ b/composite-view/src/test/java/com/iluwatar/compositeview/AppServletTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.*;
 and https://stackoverflow.com/questions/50211433/servlets-unit-testing
  */
 
-public class AppServletTest extends Mockito{
+class AppServletTest extends Mockito{
   private String msgPartOne = "<h1>This Server Doesn't Support";
   private String msgPartTwo = "Requests</h1>\n"
       + "<h2>Use a GET request with boolean values for the following parameters<h2>\n"
@@ -47,7 +47,7 @@ public class AppServletTest extends Mockito{
   private String destination = "newsDisplay.jsp";
 
   @Test
-  public void testDoGet() throws Exception {
+  void testDoGet() throws Exception {
     HttpServletRequest mockReq = Mockito.mock(HttpServletRequest.class);
     HttpServletResponse mockResp = Mockito.mock(HttpServletResponse.class);
     RequestDispatcher mockDispatcher = Mockito.mock(RequestDispatcher.class);
@@ -64,7 +64,7 @@ public class AppServletTest extends Mockito{
   }
 
   @Test
-  public void testDoPost() throws Exception {
+  void testDoPost() throws Exception {
     HttpServletRequest mockReq = Mockito.mock(HttpServletRequest.class);
     HttpServletResponse mockResp = Mockito.mock(HttpServletResponse.class);
     StringWriter stringWriter = new StringWriter();
@@ -78,7 +78,7 @@ public class AppServletTest extends Mockito{
   }
 
   @Test
-  public void testDoPut() throws Exception {
+  void testDoPut() throws Exception {
     HttpServletRequest mockReq = Mockito.mock(HttpServletRequest.class);
     HttpServletResponse mockResp = Mockito.mock(HttpServletResponse.class);
     StringWriter stringWriter = new StringWriter();
@@ -92,7 +92,7 @@ public class AppServletTest extends Mockito{
   }
 
   @Test
-  public void testDoDelete() throws Exception {
+  void testDoDelete() throws Exception {
     HttpServletRequest mockReq = Mockito.mock(HttpServletRequest.class);
     HttpServletResponse mockResp = Mockito.mock(HttpServletResponse.class);
     StringWriter stringWriter = new StringWriter();
diff --git a/composite-view/src/test/java/com/iluwatar/compositeview/JavaBeansTest.java b/composite-view/src/test/java/com/iluwatar/compositeview/JavaBeansTest.java
index 85f7e4a8a..826a00881 100644
--- a/composite-view/src/test/java/com/iluwatar/compositeview/JavaBeansTest.java
+++ b/composite-view/src/test/java/com/iluwatar/compositeview/JavaBeansTest.java
@@ -30,9 +30,9 @@ import org.mockito.Mockito;
 
 import static org.junit.Assert.*;
 
-public class JavaBeansTest {
+class JavaBeansTest {
     @Test
-    public void testDefaultConstructor() {
+    void testDefaultConstructor() {
         ClientPropertiesBean newBean = new ClientPropertiesBean();
         assertEquals("DEFAULT_NAME", newBean.getName());
         assertTrue(newBean.isBusinessInterest());
@@ -43,7 +43,7 @@ public class JavaBeansTest {
     }
 
     @Test
-    public void testNameGetterSetter() {
+    void testNameGetterSetter() {
         ClientPropertiesBean newBean = new ClientPropertiesBean();
         assertEquals("DEFAULT_NAME", newBean.getName());
         newBean.setName("TEST_NAME_ONE");
@@ -51,7 +51,7 @@ public class JavaBeansTest {
     }
 
     @Test
-    public void testBusinessSetterGetter() {
+    void testBusinessSetterGetter() {
         ClientPropertiesBean newBean = new ClientPropertiesBean();
         assertTrue(newBean.isBusinessInterest());
         newBean.setBusinessInterest(false);
@@ -59,7 +59,7 @@ public class JavaBeansTest {
     }
 
     @Test
-    public void testScienceSetterGetter() {
+    void testScienceSetterGetter() {
         ClientPropertiesBean newBean = new ClientPropertiesBean();
         assertTrue(newBean.isScienceNewsInterest());
         newBean.setScienceNewsInterest(false);
@@ -67,7 +67,7 @@ public class JavaBeansTest {
     }
 
     @Test
-    public void testSportsSetterGetter() {
+    void testSportsSetterGetter() {
         ClientPropertiesBean newBean = new ClientPropertiesBean();
         assertTrue(newBean.isSportsInterest());
         newBean.setSportsInterest(false);
@@ -75,7 +75,7 @@ public class JavaBeansTest {
     }
 
     @Test
-    public void testWorldSetterGetter() {
+    void testWorldSetterGetter() {
         ClientPropertiesBean newBean = new ClientPropertiesBean();
         assertTrue(newBean.isWorldNewsInterest());
         newBean.setWorldNewsInterest(false);
@@ -83,7 +83,7 @@ public class JavaBeansTest {
     }
 
     @Test
-    public void testRequestConstructor(){
+    void testRequestConstructor(){
         HttpServletRequest mockReq = Mockito.mock(HttpServletRequest.class);
         ClientPropertiesBean newBean = new ClientPropertiesBean((mockReq));
         assertEquals("DEFAULT_NAME", newBean.getName());
diff --git a/dao/src/test/java/com/iluwatar/dao/DbCustomerDaoTest.java b/dao/src/test/java/com/iluwatar/dao/DbCustomerDaoTest.java
index b5f6a1d2e..666c7634c 100644
--- a/dao/src/test/java/com/iluwatar/dao/DbCustomerDaoTest.java
+++ b/dao/src/test/java/com/iluwatar/dao/DbCustomerDaoTest.java
@@ -70,7 +70,7 @@ class DbCustomerDaoTest {
    * Represents the scenario where DB connectivity is present.
    */
   @Nested
-  public class ConnectionSuccess {
+  class ConnectionSuccess {
 
     /**
      * Setup for connection success scenario.
@@ -78,7 +78,7 @@ class DbCustomerDaoTest {
      * @throws Exception if any error occurs.
      */
     @BeforeEach
-    public void setUp() throws Exception {
+    void setUp() throws Exception {
       var dataSource = new JdbcDataSource();
       dataSource.setURL(DB_URL);
       dao = new DbCustomerDao(dataSource);
@@ -191,7 +191,7 @@ class DbCustomerDaoTest {
      * @throws SQLException if any error occurs.
      */
     @BeforeEach
-    public void setUp() throws SQLException {
+    void setUp() throws SQLException {
       dao = new DbCustomerDao(mockedDatasource());
     }
 
diff --git a/flux/src/test/java/com/iluwatar/flux/action/ContentTest.java b/flux/src/test/java/com/iluwatar/flux/action/ContentTest.java
index 3807ad5c8..6fec8ce38 100644
--- a/flux/src/test/java/com/iluwatar/flux/action/ContentTest.java
+++ b/flux/src/test/java/com/iluwatar/flux/action/ContentTest.java
@@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class ContentTest {
+class ContentTest {
 
   @Test
   void testToString() {
diff --git a/flux/src/test/java/com/iluwatar/flux/action/MenuItemTest.java b/flux/src/test/java/com/iluwatar/flux/action/MenuItemTest.java
index 033729997..3b995a804 100644
--- a/flux/src/test/java/com/iluwatar/flux/action/MenuItemTest.java
+++ b/flux/src/test/java/com/iluwatar/flux/action/MenuItemTest.java
@@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class MenuItemTest {
+class MenuItemTest {
 
   @Test
   void testToString() {
diff --git a/flux/src/test/java/com/iluwatar/flux/dispatcher/DispatcherTest.java b/flux/src/test/java/com/iluwatar/flux/dispatcher/DispatcherTest.java
index 192afc5d5..0657e6cf7 100644
--- a/flux/src/test/java/com/iluwatar/flux/dispatcher/DispatcherTest.java
+++ b/flux/src/test/java/com/iluwatar/flux/dispatcher/DispatcherTest.java
@@ -49,7 +49,7 @@ import org.mockito.ArgumentCaptor;
  *
  * @author Jeroen Meulemeester
  */
-public class DispatcherTest {
+class DispatcherTest {
 
   /**
    * Dispatcher is a singleton with no way to reset it's internal state back to the beginning.
@@ -57,7 +57,7 @@ public class DispatcherTest {
    * influence on each other.
    */
   @BeforeEach
-  public void setUp() throws Exception {
+  void setUp() throws Exception {
     final var constructor = Dispatcher.class.getDeclaredConstructor();
     constructor.setAccessible(true);
 
diff --git a/flux/src/test/java/com/iluwatar/flux/store/ContentStoreTest.java b/flux/src/test/java/com/iluwatar/flux/store/ContentStoreTest.java
index 046b5a829..248894a59 100644
--- a/flux/src/test/java/com/iluwatar/flux/store/ContentStoreTest.java
+++ b/flux/src/test/java/com/iluwatar/flux/store/ContentStoreTest.java
@@ -44,7 +44,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class ContentStoreTest {
+class ContentStoreTest {
 
   @Test
   void testOnAction() {
diff --git a/flux/src/test/java/com/iluwatar/flux/store/MenuStoreTest.java b/flux/src/test/java/com/iluwatar/flux/store/MenuStoreTest.java
index 58726e4c0..0e556fea5 100644
--- a/flux/src/test/java/com/iluwatar/flux/store/MenuStoreTest.java
+++ b/flux/src/test/java/com/iluwatar/flux/store/MenuStoreTest.java
@@ -44,7 +44,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class MenuStoreTest {
+class MenuStoreTest {
 
   @Test
   void testOnAction() {
diff --git a/flux/src/test/java/com/iluwatar/flux/view/ContentViewTest.java b/flux/src/test/java/com/iluwatar/flux/view/ContentViewTest.java
index e1612b5c4..54f909a9b 100644
--- a/flux/src/test/java/com/iluwatar/flux/view/ContentViewTest.java
+++ b/flux/src/test/java/com/iluwatar/flux/view/ContentViewTest.java
@@ -39,7 +39,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class ContentViewTest {
+class ContentViewTest {
 
   @Test
   void testStoreChanged() {
diff --git a/flux/src/test/java/com/iluwatar/flux/view/MenuViewTest.java b/flux/src/test/java/com/iluwatar/flux/view/MenuViewTest.java
index f22f27512..314bcf147 100644
--- a/flux/src/test/java/com/iluwatar/flux/view/MenuViewTest.java
+++ b/flux/src/test/java/com/iluwatar/flux/view/MenuViewTest.java
@@ -43,7 +43,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class MenuViewTest {
+class MenuViewTest {
 
   @Test
   void testStoreChanged() {
diff --git a/flyweight/src/test/java/com/iluwatar/flyweight/AlchemistShopTest.java b/flyweight/src/test/java/com/iluwatar/flyweight/AlchemistShopTest.java
index 925282adb..044855438 100644
--- a/flyweight/src/test/java/com/iluwatar/flyweight/AlchemistShopTest.java
+++ b/flyweight/src/test/java/com/iluwatar/flyweight/AlchemistShopTest.java
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class AlchemistShopTest {
+class AlchemistShopTest {
 
   @Test
   void testShop() {
diff --git a/front-controller/src/test/java/com/iluwatar/front/controller/ApplicationExceptionTest.java b/front-controller/src/test/java/com/iluwatar/front/controller/ApplicationExceptionTest.java
index 7f19fcc3d..9214b2ce1 100644
--- a/front-controller/src/test/java/com/iluwatar/front/controller/ApplicationExceptionTest.java
+++ b/front-controller/src/test/java/com/iluwatar/front/controller/ApplicationExceptionTest.java
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class ApplicationExceptionTest {
+class ApplicationExceptionTest {
 
   @Test
   void testCause() {
diff --git a/front-controller/src/test/java/com/iluwatar/front/controller/CommandTest.java b/front-controller/src/test/java/com/iluwatar/front/controller/CommandTest.java
index e3712582c..1906fd16e 100644
--- a/front-controller/src/test/java/com/iluwatar/front/controller/CommandTest.java
+++ b/front-controller/src/test/java/com/iluwatar/front/controller/CommandTest.java
@@ -38,17 +38,17 @@ import org.junit.jupiter.params.provider.MethodSource;
  *
  * @author Jeroen Meulemeester
  */
-public class CommandTest {
+class CommandTest {
 
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
@@ -66,7 +66,7 @@ public class CommandTest {
    */
   @ParameterizedTest
   @MethodSource("dataProvider")
-  public void testDisplay(String request, String displayMessage) {
+  void testDisplay(String request, String displayMessage) {
     final var frontController = new FrontController();
     assertEquals(0, appender.getLogSize());
     frontController.handleRequest(request);
diff --git a/front-controller/src/test/java/com/iluwatar/front/controller/FrontControllerTest.java b/front-controller/src/test/java/com/iluwatar/front/controller/FrontControllerTest.java
index 0dd1705bc..8f510cf50 100644
--- a/front-controller/src/test/java/com/iluwatar/front/controller/FrontControllerTest.java
+++ b/front-controller/src/test/java/com/iluwatar/front/controller/FrontControllerTest.java
@@ -38,17 +38,17 @@ import org.junit.jupiter.params.provider.MethodSource;
  *
  * @author Jeroen Meulemeester
  */
-public class FrontControllerTest {
+class FrontControllerTest {
 
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
@@ -66,7 +66,7 @@ public class FrontControllerTest {
    */
   @ParameterizedTest
   @MethodSource("dataProvider")
-  public void testDisplay(Command command, String displayMessage) {
+  void testDisplay(Command command, String displayMessage) {
     assertEquals(0, appender.getLogSize());
     command.process();
     assertEquals(displayMessage, appender.getLastMessage());
diff --git a/front-controller/src/test/java/com/iluwatar/front/controller/ViewTest.java b/front-controller/src/test/java/com/iluwatar/front/controller/ViewTest.java
index 490174c64..e5bb7f1d3 100644
--- a/front-controller/src/test/java/com/iluwatar/front/controller/ViewTest.java
+++ b/front-controller/src/test/java/com/iluwatar/front/controller/ViewTest.java
@@ -38,17 +38,17 @@ import org.junit.jupiter.params.provider.MethodSource;
  *
  * @author Jeroen Meulemeester
  */
-public class ViewTest {
+class ViewTest {
 
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
@@ -66,7 +66,7 @@ public class ViewTest {
    */
   @ParameterizedTest
   @MethodSource("dataProvider")
-  public void testDisplay(View view, String displayMessage) {
+  void testDisplay(View view, String displayMessage) {
     assertEquals(0, appender.getLogSize());
     view.display();
     assertEquals(displayMessage, appender.getLastMessage());
diff --git a/game-loop/src/test/java/com/iluwatar/gameloop/AppTest.java b/game-loop/src/test/java/com/iluwatar/gameloop/AppTest.java
index 9a4b58113..72997b744 100644
--- a/game-loop/src/test/java/com/iluwatar/gameloop/AppTest.java
+++ b/game-loop/src/test/java/com/iluwatar/gameloop/AppTest.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
 /**
  * App unit test class.
  */
-public class AppTest {
+class AppTest {
 
   @Test
   void shouldExecuteApplicationWithoutException() {
diff --git a/game-loop/src/test/java/com/iluwatar/gameloop/FixedStepGameLoopTest.java b/game-loop/src/test/java/com/iluwatar/gameloop/FixedStepGameLoopTest.java
index 02d8503a7..8cd00f286 100644
--- a/game-loop/src/test/java/com/iluwatar/gameloop/FixedStepGameLoopTest.java
+++ b/game-loop/src/test/java/com/iluwatar/gameloop/FixedStepGameLoopTest.java
@@ -33,17 +33,17 @@ import org.junit.jupiter.api.BeforeEach;
 /**
  * FixedStepGameLoop unit test class.
  */
-public class FixedStepGameLoopTest {
+class FixedStepGameLoopTest {
 
   private FixedStepGameLoop gameLoop;
 
   @BeforeEach
-  public void setup() {
+  void setup() {
     gameLoop = new FixedStepGameLoop();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     gameLoop = null;
   }
 
diff --git a/game-loop/src/test/java/com/iluwatar/gameloop/GameControllerTest.java b/game-loop/src/test/java/com/iluwatar/gameloop/GameControllerTest.java
index 6e3fff643..a8eef3431 100644
--- a/game-loop/src/test/java/com/iluwatar/gameloop/GameControllerTest.java
+++ b/game-loop/src/test/java/com/iluwatar/gameloop/GameControllerTest.java
@@ -35,12 +35,12 @@ class GameControllerTest {
   private GameController controller;
 
   @BeforeEach
-  public void setup() {
+  void setup() {
     controller = new GameController();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     controller = null;
   }
 
diff --git a/guarded-suspension/src/test/java/com/iluwatar/guarded/suspension/GuardedQueueTest.java b/guarded-suspension/src/test/java/com/iluwatar/guarded/suspension/GuardedQueueTest.java
index ba8623f9d..33e9fc6b7 100644
--- a/guarded-suspension/src/test/java/com/iluwatar/guarded/suspension/GuardedQueueTest.java
+++ b/guarded-suspension/src/test/java/com/iluwatar/guarded/suspension/GuardedQueueTest.java
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Test for Guarded Queue
  */
-public class GuardedQueueTest {
+class GuardedQueueTest {
   private volatile Integer value;
 
   @Test
diff --git a/half-sync-half-async/src/test/java/com/iluwatar/halfsynchalfasync/AsynchronousServiceTest.java b/half-sync-half-async/src/test/java/com/iluwatar/halfsynchalfasync/AsynchronousServiceTest.java
index 90a2f840c..a4c87135c 100644
--- a/half-sync-half-async/src/test/java/com/iluwatar/halfsynchalfasync/AsynchronousServiceTest.java
+++ b/half-sync-half-async/src/test/java/com/iluwatar/halfsynchalfasync/AsynchronousServiceTest.java
@@ -44,12 +44,12 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class AsynchronousServiceTest {
+class AsynchronousServiceTest {
   private AsynchronousService service;
   private AsyncTask<Object> task;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     service = new AsynchronousService(new LinkedBlockingQueue<>());
     task = mock(AsyncTask.class);
   }
diff --git a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterManagerTest.java b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterManagerTest.java
index 670e1bbba..a87ace422 100644
--- a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterManagerTest.java
+++ b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterManagerTest.java
@@ -39,7 +39,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class FilterManagerTest {
+class FilterManagerTest {
 
   @Test
   void testFilterRequest() {
diff --git a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterTest.java b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterTest.java
index f65a0fca0..1d2b94c0b 100644
--- a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterTest.java
+++ b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterTest.java
@@ -38,7 +38,7 @@ import org.junit.jupiter.params.provider.MethodSource;
  *
  * @author Jeroen Meulemeester
  */
-public class FilterTest {
+class FilterTest {
 
   private static final Order PERFECT_ORDER =
       new Order("name", "12345678901", "addr", "dep", "order");
@@ -89,7 +89,7 @@ public class FilterTest {
 
   @ParameterizedTest
   @MethodSource("getTestData")
-  public void testExecute(Filter filter, Order order, String expectedResult) {
+  void testExecute(Filter filter, Order order, String expectedResult) {
     final var result = filter.execute(order);
     assertNotNull(result);
     assertEquals(expectedResult, result.trim());
@@ -97,7 +97,7 @@ public class FilterTest {
 
   @ParameterizedTest
   @MethodSource("getTestData")
-  public void testNext(Filter filter) {
+  void testNext(Filter filter) {
     assertNull(filter.getNext());
     assertSame(filter, filter.getLast());
   }
diff --git a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/OrderTest.java b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/OrderTest.java
index fb83f3803..9013ed100 100644
--- a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/OrderTest.java
+++ b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/OrderTest.java
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class OrderTest {
+class OrderTest {
 
   private static final String EXPECTED_VALUE = "test";
 
diff --git a/interpreter/src/test/java/com/iluwatar/interpreter/ExpressionTest.java b/interpreter/src/test/java/com/iluwatar/interpreter/ExpressionTest.java
index 30a6f015f..b9f7102bb 100644
--- a/interpreter/src/test/java/com/iluwatar/interpreter/ExpressionTest.java
+++ b/interpreter/src/test/java/com/iluwatar/interpreter/ExpressionTest.java
@@ -102,7 +102,7 @@ public abstract class ExpressionTest<E extends Expression> {
    */
   @ParameterizedTest
   @MethodSource("expressionProvider")
-  public void testInterpret(NumberExpression first, NumberExpression second, int result) {
+  void testInterpret(NumberExpression first, NumberExpression second, int result) {
     final var expression = factory.apply(first, second);
     assertNotNull(expression);
     assertEquals(result, expression.interpret());
@@ -113,7 +113,7 @@ public abstract class ExpressionTest<E extends Expression> {
    */
   @ParameterizedTest
   @MethodSource("expressionProvider")
-  public void testToString(NumberExpression first, NumberExpression second) {
+  void testToString(NumberExpression first, NumberExpression second) {
     final var expression = factory.apply(first, second);
     assertNotNull(expression);
     assertEquals(expectedToString, expression.toString());
diff --git a/interpreter/src/test/java/com/iluwatar/interpreter/MinusExpressionTest.java b/interpreter/src/test/java/com/iluwatar/interpreter/MinusExpressionTest.java
index 7f3e11ebf..0f6891274 100644
--- a/interpreter/src/test/java/com/iluwatar/interpreter/MinusExpressionTest.java
+++ b/interpreter/src/test/java/com/iluwatar/interpreter/MinusExpressionTest.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.params.provider.Arguments;
  *
  * @author Jeroen Meulemeester
  */
-public class MinusExpressionTest extends ExpressionTest<MinusExpression> {
+class MinusExpressionTest extends ExpressionTest<MinusExpression> {
 
   /**
    * Create a new set of test entries with the expected result
diff --git a/interpreter/src/test/java/com/iluwatar/interpreter/MultiplyExpressionTest.java b/interpreter/src/test/java/com/iluwatar/interpreter/MultiplyExpressionTest.java
index f0fd1865b..7b25a16eb 100644
--- a/interpreter/src/test/java/com/iluwatar/interpreter/MultiplyExpressionTest.java
+++ b/interpreter/src/test/java/com/iluwatar/interpreter/MultiplyExpressionTest.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.params.provider.Arguments;
  *
  * @author Jeroen Meulemeester
  */
-public class MultiplyExpressionTest extends ExpressionTest<MultiplyExpression> {
+class MultiplyExpressionTest extends ExpressionTest<MultiplyExpression> {
 
   /**
    * Create a new set of test entries with the expected result
diff --git a/interpreter/src/test/java/com/iluwatar/interpreter/NumberExpressionTest.java b/interpreter/src/test/java/com/iluwatar/interpreter/NumberExpressionTest.java
index 0cf70714b..deb37e45e 100644
--- a/interpreter/src/test/java/com/iluwatar/interpreter/NumberExpressionTest.java
+++ b/interpreter/src/test/java/com/iluwatar/interpreter/NumberExpressionTest.java
@@ -36,7 +36,7 @@ import org.junit.jupiter.params.provider.MethodSource;
  *
  * @author Jeroen Meulemeester
  */
-public class NumberExpressionTest extends ExpressionTest<NumberExpression> {
+class NumberExpressionTest extends ExpressionTest<NumberExpression> {
 
   /**
    * Create a new set of test entries with the expected result
@@ -60,7 +60,7 @@ public class NumberExpressionTest extends ExpressionTest<NumberExpression> {
    */
   @ParameterizedTest
   @MethodSource("expressionProvider")
-  public void testFromString(NumberExpression first) throws Exception {
+  void testFromString(NumberExpression first) throws Exception {
     final var expectedValue = first.interpret();
     final var testStringValue = String.valueOf(expectedValue);
     final var numberExpression = new NumberExpression(testStringValue);
diff --git a/interpreter/src/test/java/com/iluwatar/interpreter/PlusExpressionTest.java b/interpreter/src/test/java/com/iluwatar/interpreter/PlusExpressionTest.java
index 0bc0d406a..a4711d18b 100644
--- a/interpreter/src/test/java/com/iluwatar/interpreter/PlusExpressionTest.java
+++ b/interpreter/src/test/java/com/iluwatar/interpreter/PlusExpressionTest.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.params.provider.Arguments;
  *
  * @author Jeroen Meulemeester
  */
-public class PlusExpressionTest extends ExpressionTest<PlusExpression> {
+class PlusExpressionTest extends ExpressionTest<PlusExpression> {
 
   /**
    * Create a new set of test entries with the expected result
diff --git a/iterator/src/test/java/com/iluwatar/iterator/list/TreasureChestTest.java b/iterator/src/test/java/com/iluwatar/iterator/list/TreasureChestTest.java
index 53ec979cd..7f0c27cd1 100644
--- a/iterator/src/test/java/com/iluwatar/iterator/list/TreasureChestTest.java
+++ b/iterator/src/test/java/com/iluwatar/iterator/list/TreasureChestTest.java
@@ -37,7 +37,7 @@ import org.junit.jupiter.params.provider.MethodSource;
  *
  * @author Jeroen Meulemeester
  */
-public class TreasureChestTest {
+class TreasureChestTest {
 
   /**
    * Create a list of all expected items in the chest.
@@ -65,7 +65,7 @@ public class TreasureChestTest {
    */
   @ParameterizedTest
   @MethodSource("dataProvider")
-  public void testIterator(Item expectedItem) {
+  void testIterator(Item expectedItem) {
     final var chest = new TreasureChest();
     final var iterator = chest.iterator(expectedItem.getType());
     assertNotNull(iterator);
@@ -92,7 +92,7 @@ public class TreasureChestTest {
    */
   @ParameterizedTest
   @MethodSource("dataProvider")
-  public void testGetItems(Item expectedItem) throws Exception {
+  void testGetItems(Item expectedItem) throws Exception {
     final var chest = new TreasureChest();
     final var items = chest.getItems();
     assertNotNull(items);
diff --git a/layers/src/test/java/com/iluwatar/layers/entity/CakeTest.java b/layers/src/test/java/com/iluwatar/layers/entity/CakeTest.java
index 958e5a0cb..6677eb428 100644
--- a/layers/src/test/java/com/iluwatar/layers/entity/CakeTest.java
+++ b/layers/src/test/java/com/iluwatar/layers/entity/CakeTest.java
@@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class CakeTest {
+class CakeTest {
 
   @Test
   void testSetId() {
diff --git a/layers/src/test/java/com/iluwatar/layers/exception/CakeBakingExceptionTest.java b/layers/src/test/java/com/iluwatar/layers/exception/CakeBakingExceptionTest.java
index d922c98b7..6a4c92b90 100644
--- a/layers/src/test/java/com/iluwatar/layers/exception/CakeBakingExceptionTest.java
+++ b/layers/src/test/java/com/iluwatar/layers/exception/CakeBakingExceptionTest.java
@@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class CakeBakingExceptionTest {
+class CakeBakingExceptionTest {
 
   @Test
   void testConstructor() {
diff --git a/layers/src/test/java/com/iluwatar/layers/service/CakeBakingServiceImplTest.java b/layers/src/test/java/com/iluwatar/layers/service/CakeBakingServiceImplTest.java
index 62b0c3667..3773869be 100644
--- a/layers/src/test/java/com/iluwatar/layers/service/CakeBakingServiceImplTest.java
+++ b/layers/src/test/java/com/iluwatar/layers/service/CakeBakingServiceImplTest.java
@@ -43,7 +43,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class CakeBakingServiceImplTest {
+class CakeBakingServiceImplTest {
 
   @Test
   void testLayers() {
diff --git a/layers/src/test/java/com/iluwatar/layers/view/CakeViewImplTest.java b/layers/src/test/java/com/iluwatar/layers/view/CakeViewImplTest.java
index 6a6dc3fea..614f90c6c 100644
--- a/layers/src/test/java/com/iluwatar/layers/view/CakeViewImplTest.java
+++ b/layers/src/test/java/com/iluwatar/layers/view/CakeViewImplTest.java
@@ -47,17 +47,17 @@ import org.slf4j.LoggerFactory;
  *
  * @author Jeroen Meulemeester
  */
-public class CakeViewImplTest {
+class CakeViewImplTest {
 
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender(CakeViewImpl.class);
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
diff --git a/lazy-loading/src/test/java/com/iluwatar/lazy/loading/HolderNaiveTest.java b/lazy-loading/src/test/java/com/iluwatar/lazy/loading/HolderNaiveTest.java
index fb73a88e2..f1ee85b80 100644
--- a/lazy-loading/src/test/java/com/iluwatar/lazy/loading/HolderNaiveTest.java
+++ b/lazy-loading/src/test/java/com/iluwatar/lazy/loading/HolderNaiveTest.java
@@ -31,7 +31,7 @@ import java.lang.reflect.Field;
  *
  * @author Jeroen Meulemeester
  */
-public class HolderNaiveTest extends AbstractHolderTest {
+class HolderNaiveTest extends AbstractHolderTest {
 
   private final HolderNaive holder = new HolderNaive();
 
diff --git a/lazy-loading/src/test/java/com/iluwatar/lazy/loading/HolderThreadSafeTest.java b/lazy-loading/src/test/java/com/iluwatar/lazy/loading/HolderThreadSafeTest.java
index d9b2a5f16..6d5fda756 100644
--- a/lazy-loading/src/test/java/com/iluwatar/lazy/loading/HolderThreadSafeTest.java
+++ b/lazy-loading/src/test/java/com/iluwatar/lazy/loading/HolderThreadSafeTest.java
@@ -31,7 +31,7 @@ import java.lang.reflect.Field;
  *
  * @author Jeroen Meulemeester
  */
-public class HolderThreadSafeTest extends AbstractHolderTest {
+class HolderThreadSafeTest extends AbstractHolderTest {
 
   private final HolderThreadSafe holder = new HolderThreadSafe();
 
diff --git a/lazy-loading/src/test/java/com/iluwatar/lazy/loading/Java8HolderTest.java b/lazy-loading/src/test/java/com/iluwatar/lazy/loading/Java8HolderTest.java
index da5fc8480..81c2f84e4 100644
--- a/lazy-loading/src/test/java/com/iluwatar/lazy/loading/Java8HolderTest.java
+++ b/lazy-loading/src/test/java/com/iluwatar/lazy/loading/Java8HolderTest.java
@@ -32,7 +32,7 @@ import java.util.function.Supplier;
  *
  * @author Jeroen Meulemeester
  */
-public class Java8HolderTest extends AbstractHolderTest {
+class Java8HolderTest extends AbstractHolderTest {
 
   private final Java8Holder holder = new Java8Holder();
 
diff --git a/leader-election/src/test/java/com/iluwatar/leaderelection/MessageTest.java b/leader-election/src/test/java/com/iluwatar/leaderelection/MessageTest.java
index 2bc638a5a..d54dcabd7 100644
--- a/leader-election/src/test/java/com/iluwatar/leaderelection/MessageTest.java
+++ b/leader-election/src/test/java/com/iluwatar/leaderelection/MessageTest.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Message test case.
  */
-public class MessageTest {
+class MessageTest {
 
   @Test
   void testGetType() {
diff --git a/leader-election/src/test/java/com/iluwatar/leaderelection/bully/BullyMessageManagerTest.java b/leader-election/src/test/java/com/iluwatar/leaderelection/bully/BullyMessageManagerTest.java
index 5d1721007..11e4e8502 100644
--- a/leader-election/src/test/java/com/iluwatar/leaderelection/bully/BullyMessageManagerTest.java
+++ b/leader-election/src/test/java/com/iluwatar/leaderelection/bully/BullyMessageManagerTest.java
@@ -39,7 +39,7 @@ import org.junit.jupiter.api.Test;
 /**
  * BullyMessageManager unit test.
  */
-public class BullyMessageManagerTest {
+class BullyMessageManagerTest {
 
   @Test
   void testSendHeartbeatMessage() {
diff --git a/leader-election/src/test/java/com/iluwatar/leaderelection/bully/BullyinstanceTest.java b/leader-election/src/test/java/com/iluwatar/leaderelection/bully/BullyinstanceTest.java
index f2e799b58..e036b05a5 100644
--- a/leader-election/src/test/java/com/iluwatar/leaderelection/bully/BullyinstanceTest.java
+++ b/leader-election/src/test/java/com/iluwatar/leaderelection/bully/BullyinstanceTest.java
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test;
 /**
  * BullyInstance unit test.
  */
-public class BullyinstanceTest {
+class BullyinstanceTest {
 
   @Test
   void testOnMessage() {
diff --git a/leader-election/src/test/java/com/iluwatar/leaderelection/ring/RingInstanceTest.java b/leader-election/src/test/java/com/iluwatar/leaderelection/ring/RingInstanceTest.java
index 1d575e811..2c0634d71 100644
--- a/leader-election/src/test/java/com/iluwatar/leaderelection/ring/RingInstanceTest.java
+++ b/leader-election/src/test/java/com/iluwatar/leaderelection/ring/RingInstanceTest.java
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test;
 /**
  * RingInstance unit test.
  */
-public class RingInstanceTest {
+class RingInstanceTest {
 
   @Test
   void testOnMessage() {
diff --git a/leader-election/src/test/java/com/iluwatar/leaderelection/ring/RingMessageManagerTest.java b/leader-election/src/test/java/com/iluwatar/leaderelection/ring/RingMessageManagerTest.java
index 2e75e5ac9..4dc842658 100644
--- a/leader-election/src/test/java/com/iluwatar/leaderelection/ring/RingMessageManagerTest.java
+++ b/leader-election/src/test/java/com/iluwatar/leaderelection/ring/RingMessageManagerTest.java
@@ -39,7 +39,7 @@ import org.junit.jupiter.api.Test;
 /**
  * RingMessageManager unit test.
  */
-public class RingMessageManagerTest {
+class RingMessageManagerTest {
 
   @Test
   void testSendHeartbeatMessage() {
diff --git a/marker/src/test/java/ThiefTest.java b/marker/src/test/java/ThiefTest.java
index 905fc82ce..91f312930 100644
--- a/marker/src/test/java/ThiefTest.java
+++ b/marker/src/test/java/ThiefTest.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Thief test
  */
-public class ThiefTest {
+class ThiefTest {
   @Test
   void testThief() {
     var thief = new Thief();
diff --git a/mediator/src/test/java/com/iluwatar/mediator/PartyImplTest.java b/mediator/src/test/java/com/iluwatar/mediator/PartyImplTest.java
index 7f0ec006f..0d3d7300d 100644
--- a/mediator/src/test/java/com/iluwatar/mediator/PartyImplTest.java
+++ b/mediator/src/test/java/com/iluwatar/mediator/PartyImplTest.java
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class PartyImplTest {
+class PartyImplTest {
 
   /**
    * Verify if a member is notified when it's joining a party. Generate an action and see if the
diff --git a/mediator/src/test/java/com/iluwatar/mediator/PartyMemberTest.java b/mediator/src/test/java/com/iluwatar/mediator/PartyMemberTest.java
index 91eec97a0..72270f2f7 100644
--- a/mediator/src/test/java/com/iluwatar/mediator/PartyMemberTest.java
+++ b/mediator/src/test/java/com/iluwatar/mediator/PartyMemberTest.java
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author Jeroen Meulemeester
  */
-public class PartyMemberTest {
+class PartyMemberTest {
 
   static Stream<Arguments> dataProvider() {
     return Stream.of(
@@ -61,12 +61,12 @@ public class PartyMemberTest {
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender(PartyMemberBase.class);
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
@@ -75,7 +75,7 @@ public class PartyMemberTest {
    */
   @ParameterizedTest
   @MethodSource("dataProvider")
-  public void testPartyAction(Supplier<PartyMember> memberSupplier) {
+  void testPartyAction(Supplier<PartyMember> memberSupplier) {
     final var member = memberSupplier.get();
 
     for (final var action : Action.values()) {
@@ -91,7 +91,7 @@ public class PartyMemberTest {
    */
   @ParameterizedTest
   @MethodSource("dataProvider")
-  public void testAct(Supplier<PartyMember> memberSupplier) {
+  void testAct(Supplier<PartyMember> memberSupplier) {
     final var member = memberSupplier.get();
 
     member.act(Action.GOLD);
@@ -115,7 +115,7 @@ public class PartyMemberTest {
    */
   @ParameterizedTest
   @MethodSource("dataProvider")
-  public void testToString(Supplier<PartyMember> memberSupplier) {
+  void testToString(Supplier<PartyMember> memberSupplier) {
     final var member = memberSupplier.get();
     final var memberClass = member.getClass();
     assertEquals(memberClass.getSimpleName(), member.toString());
diff --git a/memento/src/test/java/com/iluwatar/memento/StarTest.java b/memento/src/test/java/com/iluwatar/memento/StarTest.java
index 1837b53ec..85bebd529 100644
--- a/memento/src/test/java/com/iluwatar/memento/StarTest.java
+++ b/memento/src/test/java/com/iluwatar/memento/StarTest.java
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class StarTest {
+class StarTest {
 
   /**
    * Verify the stages of a dying sun, without going back in time
diff --git a/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantControllerTest.java b/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantControllerTest.java
index ed20a0b5c..e598e19b4 100644
--- a/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantControllerTest.java
+++ b/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantControllerTest.java
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class GiantControllerTest {
+class GiantControllerTest {
 
   /**
    * Verify if the controller passes the health level through to the model and vice versa
diff --git a/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantModelTest.java b/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantModelTest.java
index a2949ab55..74113c277 100644
--- a/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantModelTest.java
+++ b/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantModelTest.java
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class GiantModelTest {
+class GiantModelTest {
 
   /**
    * Verify if the health value is set properly though the constructor and setter
diff --git a/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantViewTest.java b/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantViewTest.java
index c5131d48c..58bfbe3a1 100644
--- a/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantViewTest.java
+++ b/model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantViewTest.java
@@ -42,17 +42,17 @@ import org.slf4j.LoggerFactory;
  *
  * @author Jeroen Meulemeester
  */
-public class GiantViewTest {
+class GiantViewTest {
 
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender(GiantView.class);
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
diff --git a/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileLoaderTest.java b/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileLoaderTest.java
index 4387171c1..522fb81e1 100644
--- a/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileLoaderTest.java
+++ b/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileLoaderTest.java
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class FileLoaderTest {
+class FileLoaderTest {
 
   @Test
   void testLoadData() {
diff --git a/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileSelectorPresenterTest.java b/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileSelectorPresenterTest.java
index 261849a5d..b77b0bd83 100644
--- a/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileSelectorPresenterTest.java
+++ b/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileSelectorPresenterTest.java
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test;
  * This test case is responsible for testing our application by taking advantage of the
  * Model-View-Controller architectural pattern.
  */
-public class FileSelectorPresenterTest {
+class FileSelectorPresenterTest {
 
   /**
    * The Presenter component.
@@ -57,7 +57,7 @@ public class FileSelectorPresenterTest {
    * Initializes the components of the test case.
    */
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     this.stub = new FileSelectorStub();
     this.loader = new FileLoader();
     presenter = new FileSelectorPresenter(this.stub);
diff --git a/monad/src/test/java/com/iluwatar/monad/MonadTest.java b/monad/src/test/java/com/iluwatar/monad/MonadTest.java
index 1a74cf72f..44d587b08 100644
--- a/monad/src/test/java/com/iluwatar/monad/MonadTest.java
+++ b/monad/src/test/java/com/iluwatar/monad/MonadTest.java
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Test for Monad Pattern
  */
-public class MonadTest {
+class MonadTest {
 
   @Test
   void testForInvalidName() {
diff --git a/monitor/src/test/java/com/iluwatar/monitor/BankTest.java b/monitor/src/test/java/com/iluwatar/monitor/BankTest.java
index 030513a54..75588ad21 100644
--- a/monitor/src/test/java/com/iluwatar/monitor/BankTest.java
+++ b/monitor/src/test/java/com/iluwatar/monitor/BankTest.java
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assumptions.*;
 
-public class BankTest {
+class BankTest {
 
   private static final int ACCOUNT_NUM = 4;
   private static final int BASE_AMOUNT = 1000;
diff --git a/monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java b/monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java
index ebf2cee9c..ea10bc0be 100644
--- a/monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java
+++ b/monostate/src/test/java/com/iluwatar/monostate/LoadBalancerTest.java
@@ -41,7 +41,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class LoadBalancerTest {
+class LoadBalancerTest {
 
   @Test
   void testSameStateAmongstAllInstances() {
diff --git a/multiton/src/test/java/com/iluwatar/multiton/NazgulTest.java b/multiton/src/test/java/com/iluwatar/multiton/NazgulTest.java
index 26f9203d8..624f4198b 100644
--- a/multiton/src/test/java/com/iluwatar/multiton/NazgulTest.java
+++ b/multiton/src/test/java/com/iluwatar/multiton/NazgulTest.java
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class NazgulTest {
+class NazgulTest {
 
   /**
    * Verify if {@link Nazgul#getInstance(NazgulName)} returns the correct Nazgul multiton instance
diff --git a/naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java b/naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
index 9eb43a746..0dd50eeec 100644
--- a/naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
+++ b/naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectTest.java
@@ -33,17 +33,17 @@ import org.junit.Test;
 /**
  * Test for SimpleObject
  */
-public class SimpleObjectTest {
+class SimpleObjectTest {
 
   SimpleObject simpleObject;
 
   @Before
-  public void setUp() {
+  void setUp() {
     simpleObject = new SimpleObject();
   }
 
   @Test
-  public void testName() {
+  void testName() {
     // given
     String name = "Foobar";
     assertNull(simpleObject.getName());
diff --git a/naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java b/naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
index 82d9ada7f..66a9afc42 100644
--- a/naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
+++ b/naked-objects/dom/src/test/java/domainapp/dom/modules/simple/SimpleObjectsTest.java
@@ -41,7 +41,7 @@ import org.junit.Test;
 /**
  * Test for SimpleObjects
  */
-public class SimpleObjectsTest {
+class SimpleObjectsTest {
 
   @Rule
   public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
@@ -52,13 +52,13 @@ public class SimpleObjectsTest {
   SimpleObjects simpleObjects;
 
   @Before
-  public void setUp() {
+  void setUp() {
     simpleObjects = new SimpleObjects();
     simpleObjects.container = mockContainer;
   }
 
   @Test
-  public void testCreate() {
+  void testCreate() {
 
     // given
     final SimpleObject simpleObject = new SimpleObject();
@@ -85,7 +85,7 @@ public class SimpleObjectsTest {
   }
 
   @Test
-  public void testListAll() {
+  void testListAll() {
 
     // given
     final List<SimpleObject> all = Lists.newArrayList();
diff --git a/null-object/src/test/java/com/iluwatar/nullobject/TreeTest.java b/null-object/src/test/java/com/iluwatar/nullobject/TreeTest.java
index 8f0e592cd..80ff86759 100644
--- a/null-object/src/test/java/com/iluwatar/nullobject/TreeTest.java
+++ b/null-object/src/test/java/com/iluwatar/nullobject/TreeTest.java
@@ -44,17 +44,17 @@ import org.slf4j.LoggerFactory;
  *
  * @author Jeroen Meulemeester
  */
-public class TreeTest {
+class TreeTest {
 
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
diff --git a/object-mother/src/test/java/com/iluwatar/objectmother/test/RoyaltyObjectMotherTest.java b/object-mother/src/test/java/com/iluwatar/objectmother/test/RoyaltyObjectMotherTest.java
index d2d167f87..3b5655714 100644
--- a/object-mother/src/test/java/com/iluwatar/objectmother/test/RoyaltyObjectMotherTest.java
+++ b/object-mother/src/test/java/com/iluwatar/objectmother/test/RoyaltyObjectMotherTest.java
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Test Generation of Royalty Types using the object-mother
  */
-public class RoyaltyObjectMotherTest {
+class RoyaltyObjectMotherTest {
 
   @Test
   void unsuccessfulKingFlirt() {
diff --git a/observer/src/test/java/com/iluwatar/observer/HobbitsTest.java b/observer/src/test/java/com/iluwatar/observer/HobbitsTest.java
index cf36b1080..13e8025f0 100644
--- a/observer/src/test/java/com/iluwatar/observer/HobbitsTest.java
+++ b/observer/src/test/java/com/iluwatar/observer/HobbitsTest.java
@@ -32,7 +32,7 @@ import java.util.List;
  *
  * @author Jeroen Meulemeester
  */
-public class HobbitsTest extends WeatherObserverTest<Hobbits> {
+class HobbitsTest extends WeatherObserverTest<Hobbits> {
 
   @Override
   public Collection<Object[]> dataProvider() {
diff --git a/observer/src/test/java/com/iluwatar/observer/OrcsTest.java b/observer/src/test/java/com/iluwatar/observer/OrcsTest.java
index 3a21ad739..e7a0dfdd9 100644
--- a/observer/src/test/java/com/iluwatar/observer/OrcsTest.java
+++ b/observer/src/test/java/com/iluwatar/observer/OrcsTest.java
@@ -32,7 +32,7 @@ import java.util.List;
  *
  * @author Jeroen Meulemeester
  */
-public class OrcsTest extends WeatherObserverTest<Orcs> {
+class OrcsTest extends WeatherObserverTest<Orcs> {
 
   @Override
   public Collection<Object[]> dataProvider() {
diff --git a/observer/src/test/java/com/iluwatar/observer/WeatherObserverTest.java b/observer/src/test/java/com/iluwatar/observer/WeatherObserverTest.java
index a0b1f201a..256a8b7d9 100644
--- a/observer/src/test/java/com/iluwatar/observer/WeatherObserverTest.java
+++ b/observer/src/test/java/com/iluwatar/observer/WeatherObserverTest.java
@@ -50,12 +50,12 @@ public abstract class WeatherObserverTest<O extends WeatherObserver> {
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
@@ -80,7 +80,7 @@ public abstract class WeatherObserverTest<O extends WeatherObserver> {
    */
   @ParameterizedTest
   @MethodSource("dataProvider")
-  public void testObserver(WeatherType weather, String response) {
+  void testObserver(WeatherType weather, String response) {
     final var observer = this.factory.get();
     assertEquals(0, appender.getLogSize());
 
diff --git a/observer/src/test/java/com/iluwatar/observer/WeatherTest.java b/observer/src/test/java/com/iluwatar/observer/WeatherTest.java
index 72c78a091..423929c87 100644
--- a/observer/src/test/java/com/iluwatar/observer/WeatherTest.java
+++ b/observer/src/test/java/com/iluwatar/observer/WeatherTest.java
@@ -41,17 +41,17 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class WeatherTest {
+class WeatherTest {
 
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender(Weather.class);
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
diff --git a/observer/src/test/java/com/iluwatar/observer/generic/GHobbitsTest.java b/observer/src/test/java/com/iluwatar/observer/generic/GHobbitsTest.java
index b597e6d05..61bf1214c 100644
--- a/observer/src/test/java/com/iluwatar/observer/generic/GHobbitsTest.java
+++ b/observer/src/test/java/com/iluwatar/observer/generic/GHobbitsTest.java
@@ -34,7 +34,7 @@ import java.util.List;
  *
  * @author Jeroen Meulemeester
  */
-public class GHobbitsTest extends ObserverTest<GHobbits> {
+class GHobbitsTest extends ObserverTest<GHobbits> {
 
   @Override
   public Collection<Object[]> dataProvider() {
diff --git a/observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java b/observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java
index e0241bbf7..338a28691 100644
--- a/observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java
+++ b/observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java
@@ -43,17 +43,17 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class GWeatherTest {
+class GWeatherTest {
 
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender(GWeather.class);
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
diff --git a/observer/src/test/java/com/iluwatar/observer/generic/ObserverTest.java b/observer/src/test/java/com/iluwatar/observer/generic/ObserverTest.java
index 8741acee8..f7af260f1 100644
--- a/observer/src/test/java/com/iluwatar/observer/generic/ObserverTest.java
+++ b/observer/src/test/java/com/iluwatar/observer/generic/ObserverTest.java
@@ -49,12 +49,12 @@ public abstract class ObserverTest<O extends Observer<?, ?, WeatherType>> {
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
@@ -79,7 +79,7 @@ public abstract class ObserverTest<O extends Observer<?, ?, WeatherType>> {
    */
   @ParameterizedTest
   @MethodSource("dataProvider")
-  public void testObserver(WeatherType weather, String response) {
+  void testObserver(WeatherType weather, String response) {
     final var observer = this.factory.get();
     assertEquals(0, appender.getLogSize());
 
diff --git a/observer/src/test/java/com/iluwatar/observer/generic/OrcsTest.java b/observer/src/test/java/com/iluwatar/observer/generic/OrcsTest.java
index 10b9ed276..a4d743404 100644
--- a/observer/src/test/java/com/iluwatar/observer/generic/OrcsTest.java
+++ b/observer/src/test/java/com/iluwatar/observer/generic/OrcsTest.java
@@ -34,7 +34,7 @@ import java.util.List;
  *
  * @author Jeroen Meulemeester
  */
-public class OrcsTest extends ObserverTest<GOrcs> {
+class OrcsTest extends ObserverTest<GOrcs> {
 
   @Override
   public Collection<Object[]> dataProvider() {
diff --git a/page-object/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java b/page-object/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java
index 040e91b85..9bab578a5 100644
--- a/page-object/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java
+++ b/page-object/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java
@@ -34,12 +34,12 @@ import org.junit.jupiter.api.Test;
 /**
  * Test Album Selection and Album Listing
  */
-public class AlbumListPageTest {
+class AlbumListPageTest {
 
   private final AlbumListPage albumListPage = new AlbumListPage(new WebClient());
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     albumListPage.navigateToPage();
   }
 
diff --git a/page-object/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java b/page-object/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java
index 71680c806..4448efbd8 100644
--- a/page-object/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java
+++ b/page-object/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java
@@ -34,12 +34,12 @@ import org.junit.jupiter.api.Test;
 /**
  * Test Album Page Operations
  */
-public class AlbumPageTest {
+class AlbumPageTest {
 
   private final AlbumPage albumPage = new AlbumPage(new WebClient());
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     albumPage.navigateToPage();
   }
 
diff --git a/page-object/src/test/java/com/iluwatar/pageobject/LoginPageTest.java b/page-object/src/test/java/com/iluwatar/pageobject/LoginPageTest.java
index 11ee486c9..ac74aee12 100644
--- a/page-object/src/test/java/com/iluwatar/pageobject/LoginPageTest.java
+++ b/page-object/src/test/java/com/iluwatar/pageobject/LoginPageTest.java
@@ -34,12 +34,12 @@ import org.junit.jupiter.api.Test;
 /**
  * Test Login Page Object
  */
-public class LoginPageTest {
+class LoginPageTest {
 
   private final LoginPage loginPage = new LoginPage(new WebClient());
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     loginPage.navigateToPage();
   }
 
diff --git a/page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java b/page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java
index 3088646e9..519baa4ed 100644
--- a/page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java
+++ b/page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java
@@ -33,12 +33,12 @@ import org.junit.jupiter.api.Test;
 /**
  * Test Album Selection and Album Listing
  */
-public class AlbumListPageTest {
+class AlbumListPageTest {
 
   private final AlbumListPage albumListPage = new AlbumListPage(new WebClient());
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     albumListPage.navigateToPage();
   }
 
diff --git a/page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java b/page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java
index 55fe0d95c..f0586ee40 100644
--- a/page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java
+++ b/page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java
@@ -33,12 +33,12 @@ import org.junit.jupiter.api.Test;
 /**
  * Test Album Page Operations
  */
-public class AlbumPageTest {
+class AlbumPageTest {
 
   private final AlbumPage albumPage = new AlbumPage(new WebClient());
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     albumPage.navigateToPage();
   }
 
diff --git a/page-object/test-automation/src/test/java/com/iluwatar/pageobject/LoginPageTest.java b/page-object/test-automation/src/test/java/com/iluwatar/pageobject/LoginPageTest.java
index 9d331956d..3e0bb6736 100644
--- a/page-object/test-automation/src/test/java/com/iluwatar/pageobject/LoginPageTest.java
+++ b/page-object/test-automation/src/test/java/com/iluwatar/pageobject/LoginPageTest.java
@@ -33,12 +33,12 @@ import org.junit.jupiter.api.Test;
 /**
  * Test Login Page Object
  */
-public class LoginPageTest {
+class LoginPageTest {
 
   private final LoginPage loginPage = new LoginPage(new WebClient());
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     loginPage.navigateToPage();
   }
 
diff --git a/parameter-object/src/test/java/com/iluwatar/parameter/object/ParameterObjectTest.java b/parameter-object/src/test/java/com/iluwatar/parameter/object/ParameterObjectTest.java
index 51c4ed03b..93b1aff5e 100644
--- a/parameter-object/src/test/java/com/iluwatar/parameter/object/ParameterObjectTest.java
+++ b/parameter-object/src/test/java/com/iluwatar/parameter/object/ParameterObjectTest.java
@@ -35,7 +35,7 @@ class ParameterObjectTest {
   private static final Logger LOGGER = LoggerFactory.getLogger(ParameterObjectTest.class);
 
   @Test
-  public void testForDefaultSortBy() {
+  void testForDefaultSortBy() {
     //Creating parameter object with default value for SortBy set
     ParameterObject params = ParameterObject.newBuilder()
         .withType("sneakers")
@@ -49,7 +49,7 @@ class ParameterObjectTest {
   }
 
   @Test
-  public void testForDefaultSortOrder() {
+  void testForDefaultSortOrder() {
     //Creating parameter object with default value for SortOrder set
     ParameterObject params = ParameterObject.newBuilder()
         .withType("sneakers")
diff --git a/parameter-object/src/test/java/com/iluwatar/parameter/object/SearchServiceTest.java b/parameter-object/src/test/java/com/iluwatar/parameter/object/SearchServiceTest.java
index 0c674fe5f..32e669832 100644
--- a/parameter-object/src/test/java/com/iluwatar/parameter/object/SearchServiceTest.java
+++ b/parameter-object/src/test/java/com/iluwatar/parameter/object/SearchServiceTest.java
@@ -37,7 +37,7 @@ class SearchServiceTest {
   private SearchService searchService;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     //Creating parameter object with default values set
     parameterObject = ParameterObject.newBuilder()
         .withType("sneakers")
@@ -50,7 +50,7 @@ class SearchServiceTest {
    *  Testing parameter object against the overloaded method to verify if the behaviour is same.
    */
   @Test
-  public void testDefaultParametersMatch() {
+  void testDefaultParametersMatch() {
     assertEquals(searchService.search(parameterObject), searchService.search("sneakers",
         SortOrder.ASC), "Default Parameter values do not not match.");
     LOGGER.info("SortBy Default parameter value matches.");
diff --git a/pipeline/src/test/java/com/iluwatar/pipeline/PipelineTest.java b/pipeline/src/test/java/com/iluwatar/pipeline/PipelineTest.java
index c6e1361d8..677c8eb50 100644
--- a/pipeline/src/test/java/com/iluwatar/pipeline/PipelineTest.java
+++ b/pipeline/src/test/java/com/iluwatar/pipeline/PipelineTest.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Test for {@link Pipeline}
  */
-public class PipelineTest {
+class PipelineTest {
 
   @Test
   void testAddHandlersToPipeline() {
diff --git a/poison-pill/src/test/java/com/iluwatar/poison/pill/ConsumerTest.java b/poison-pill/src/test/java/com/iluwatar/poison/pill/ConsumerTest.java
index 78bac2db2..2ac708990 100644
--- a/poison-pill/src/test/java/com/iluwatar/poison/pill/ConsumerTest.java
+++ b/poison-pill/src/test/java/com/iluwatar/poison/pill/ConsumerTest.java
@@ -42,17 +42,17 @@ import org.slf4j.LoggerFactory;
  *
  * @author Jeroen Meulemeester
  */
-public class ConsumerTest {
+class ConsumerTest {
 
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender(Consumer.class);
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
diff --git a/poison-pill/src/test/java/com/iluwatar/poison/pill/PoisonMessageTest.java b/poison-pill/src/test/java/com/iluwatar/poison/pill/PoisonMessageTest.java
index 3d3d14850..e653cadb4 100644
--- a/poison-pill/src/test/java/com/iluwatar/poison/pill/PoisonMessageTest.java
+++ b/poison-pill/src/test/java/com/iluwatar/poison/pill/PoisonMessageTest.java
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class PoisonMessageTest {
+class PoisonMessageTest {
 
   @Test
   void testAddHeader() {
diff --git a/poison-pill/src/test/java/com/iluwatar/poison/pill/ProducerTest.java b/poison-pill/src/test/java/com/iluwatar/poison/pill/ProducerTest.java
index 095c4f1d0..0345ee361 100644
--- a/poison-pill/src/test/java/com/iluwatar/poison/pill/ProducerTest.java
+++ b/poison-pill/src/test/java/com/iluwatar/poison/pill/ProducerTest.java
@@ -41,7 +41,7 @@ import org.mockito.ArgumentCaptor;
  *
  * @author Jeroen Meulemeester
  */
-public class ProducerTest {
+class ProducerTest {
 
   @Test
   void testSend() throws Exception {
diff --git a/poison-pill/src/test/java/com/iluwatar/poison/pill/SimpleMessageTest.java b/poison-pill/src/test/java/com/iluwatar/poison/pill/SimpleMessageTest.java
index f89bae9fe..27aadba91 100644
--- a/poison-pill/src/test/java/com/iluwatar/poison/pill/SimpleMessageTest.java
+++ b/poison-pill/src/test/java/com/iluwatar/poison/pill/SimpleMessageTest.java
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class SimpleMessageTest {
+class SimpleMessageTest {
 
   @Test
   void testGetHeaders() {
diff --git a/priority-queue/src/test/java/com/iluwatar/priority/queue/PriorityMessageQueueTest.java b/priority-queue/src/test/java/com/iluwatar/priority/queue/PriorityMessageQueueTest.java
index 5c4001d6a..d539e4e8a 100644
--- a/priority-queue/src/test/java/com/iluwatar/priority/queue/PriorityMessageQueueTest.java
+++ b/priority-queue/src/test/java/com/iluwatar/priority/queue/PriorityMessageQueueTest.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Test case for order of messages
  */
-public class PriorityMessageQueueTest {
+class PriorityMessageQueueTest {
 
 
   @Test
diff --git a/priority-queue/src/test/java/com/iluwatar/priority/queue/QueueManagerTest.java b/priority-queue/src/test/java/com/iluwatar/priority/queue/QueueManagerTest.java
index 74bde91ca..c5f2a515b 100644
--- a/priority-queue/src/test/java/com/iluwatar/priority/queue/QueueManagerTest.java
+++ b/priority-queue/src/test/java/com/iluwatar/priority/queue/QueueManagerTest.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Check queue manager
  */
-public class QueueManagerTest {
+class QueueManagerTest {
 
   @Test
   void publishMessage() {
diff --git a/private-class-data/src/test/java/com/iluwatar/privateclassdata/ImmutableStewTest.java b/private-class-data/src/test/java/com/iluwatar/privateclassdata/ImmutableStewTest.java
index 8cf4c9cb5..62fd58141 100644
--- a/private-class-data/src/test/java/com/iluwatar/privateclassdata/ImmutableStewTest.java
+++ b/private-class-data/src/test/java/com/iluwatar/privateclassdata/ImmutableStewTest.java
@@ -36,17 +36,17 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class ImmutableStewTest {
+class ImmutableStewTest {
 
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
diff --git a/private-class-data/src/test/java/com/iluwatar/privateclassdata/StewTest.java b/private-class-data/src/test/java/com/iluwatar/privateclassdata/StewTest.java
index f37a158fc..e8153017f 100644
--- a/private-class-data/src/test/java/com/iluwatar/privateclassdata/StewTest.java
+++ b/private-class-data/src/test/java/com/iluwatar/privateclassdata/StewTest.java
@@ -36,17 +36,17 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class StewTest {
+class StewTest {
 
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
diff --git a/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ConsumerTest.java b/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ConsumerTest.java
index d7124389c..553307523 100644
--- a/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ConsumerTest.java
+++ b/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ConsumerTest.java
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class ConsumerTest {
+class ConsumerTest {
 
   private static final int ITEM_COUNT = 5;
 
diff --git a/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ProducerTest.java b/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ProducerTest.java
index fe1a7a389..1f4579bb0 100644
--- a/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ProducerTest.java
+++ b/producer-consumer/src/test/java/com/iluwatar/producer/consumer/ProducerTest.java
@@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class ProducerTest {
+class ProducerTest {
 
   @Test
   void testProduce() {
diff --git a/promise/src/test/java/com/iluwatar/promise/PromiseTest.java b/promise/src/test/java/com/iluwatar/promise/PromiseTest.java
index 891f77ee8..72becbc33 100644
--- a/promise/src/test/java/com/iluwatar/promise/PromiseTest.java
+++ b/promise/src/test/java/com/iluwatar/promise/PromiseTest.java
@@ -50,7 +50,7 @@ class PromiseTest {
   private Promise<Integer> promise;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     executor = Executors.newSingleThreadExecutor();
     promise = new Promise<>();
   }
diff --git a/property/src/test/java/com/iluwatar/property/CharacterTest.java b/property/src/test/java/com/iluwatar/property/CharacterTest.java
index b92a27a6e..dfc22a6d2 100644
--- a/property/src/test/java/com/iluwatar/property/CharacterTest.java
+++ b/property/src/test/java/com/iluwatar/property/CharacterTest.java
@@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class CharacterTest {
+class CharacterTest {
 
   @Test
   void testPrototypeStats() throws Exception {
diff --git a/proxy/src/test/java/com/iluwatar/proxy/IvoryTowerTest.java b/proxy/src/test/java/com/iluwatar/proxy/IvoryTowerTest.java
index 787795c24..4531a67fc 100644
--- a/proxy/src/test/java/com/iluwatar/proxy/IvoryTowerTest.java
+++ b/proxy/src/test/java/com/iluwatar/proxy/IvoryTowerTest.java
@@ -41,12 +41,12 @@ class IvoryTowerTest {
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender(IvoryTower.class);
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
diff --git a/proxy/src/test/java/com/iluwatar/proxy/WizardTowerProxyTest.java b/proxy/src/test/java/com/iluwatar/proxy/WizardTowerProxyTest.java
index 676d9c165..1b3305296 100644
--- a/proxy/src/test/java/com/iluwatar/proxy/WizardTowerProxyTest.java
+++ b/proxy/src/test/java/com/iluwatar/proxy/WizardTowerProxyTest.java
@@ -41,12 +41,12 @@ class WizardTowerProxyTest {
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
diff --git a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderAndWriterTest.java b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderAndWriterTest.java
index a42f3700d..bc1716146 100644
--- a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderAndWriterTest.java
+++ b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderAndWriterTest.java
@@ -43,12 +43,12 @@ class ReaderAndWriterTest {
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
diff --git a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderTest.java b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderTest.java
index c521d4d56..2fb31f36c 100644
--- a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderTest.java
+++ b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/ReaderTest.java
@@ -44,12 +44,12 @@ class ReaderTest {
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender(Reader.class);
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
diff --git a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/WriterTest.java b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/WriterTest.java
index 80a2a2e5c..9c8422c0f 100644
--- a/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/WriterTest.java
+++ b/reader-writer-lock/src/test/java/com/iluwatar/reader/writer/lock/WriterTest.java
@@ -44,12 +44,12 @@ class WriterTest {
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender(Writer.class);
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
diff --git a/registry/src/test/java/com/iluwatar/registry/CustomerRegistryTest.java b/registry/src/test/java/com/iluwatar/registry/CustomerRegistryTest.java
index ea5937a9b..c39c03654 100644
--- a/registry/src/test/java/com/iluwatar/registry/CustomerRegistryTest.java
+++ b/registry/src/test/java/com/iluwatar/registry/CustomerRegistryTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-public class CustomerRegistryTest {
+class CustomerRegistryTest {
 
   private static CustomerRegistry customerRegistry;
 
@@ -41,7 +41,7 @@ public class CustomerRegistryTest {
   }
 
   @Test
-  public void shouldBeAbleToAddAndQueryCustomerObjectFromRegistry() {
+  void shouldBeAbleToAddAndQueryCustomerObjectFromRegistry() {
     Customer john = new Customer("1", "john");
     Customer julia = new Customer("2", "julia");
 
diff --git a/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java b/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java
index 5344075a7..044169211 100644
--- a/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java
+++ b/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java
@@ -60,7 +60,7 @@ class AnnotationBasedRepositoryTest {
    * Prepare data for test
    */
   @BeforeEach
-  public void setup() {
+  void setup() {
     repository.saveAll(persons);
   }
 
@@ -112,7 +112,7 @@ class AnnotationBasedRepositoryTest {
   }
 
   @AfterEach
-  public void cleanup() {
+  void cleanup() {
     repository.deleteAll();
   }
 
diff --git a/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java b/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java
index 63810c073..7ecbef9c8 100644
--- a/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java
+++ b/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java
@@ -60,7 +60,7 @@ class RepositoryTest {
    * Prepare data for test
    */
   @BeforeEach
-  public void setup() {
+  void setup() {
     repository.saveAll(persons);
   }
 
@@ -112,7 +112,7 @@ class RepositoryTest {
   }
 
   @AfterEach
-  public void cleanup() {
+  void cleanup() {
     repository.deleteAll();
   }
 
diff --git a/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/ClosableTest.java b/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/ClosableTest.java
index 2395de0a3..32b34e00d 100644
--- a/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/ClosableTest.java
+++ b/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/ClosableTest.java
@@ -46,12 +46,12 @@ class ClosableTest {
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
@@ -68,7 +68,7 @@ class ClosableTest {
   /**
    * Logging Appender Implementation
    */
-  public class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+  class InMemoryAppender extends AppenderBase<ILoggingEvent> {
     private final List<ILoggingEvent> log = new LinkedList<>();
 
     public InMemoryAppender() {
diff --git a/serverless/src/test/java/com/iluwatar/serverless/baas/api/FindPersonApiHandlerTest.java b/serverless/src/test/java/com/iluwatar/serverless/baas/api/FindPersonApiHandlerTest.java
index bd135d055..97a0c7b4b 100644
--- a/serverless/src/test/java/com/iluwatar/serverless/baas/api/FindPersonApiHandlerTest.java
+++ b/serverless/src/test/java/com/iluwatar/serverless/baas/api/FindPersonApiHandlerTest.java
@@ -51,7 +51,7 @@ class FindPersonApiHandlerTest {
   private DynamoDBMapper dynamoDbMapper;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     MockitoAnnotations.openMocks(this);
     this.findPersonApiHandler = new FindPersonApiHandler();
     this.findPersonApiHandler.setDynamoDbMapper(dynamoDbMapper);
diff --git a/serverless/src/test/java/com/iluwatar/serverless/baas/api/SavePersonApiHandlerTest.java b/serverless/src/test/java/com/iluwatar/serverless/baas/api/SavePersonApiHandlerTest.java
index 77ab76818..ccbeb92c1 100644
--- a/serverless/src/test/java/com/iluwatar/serverless/baas/api/SavePersonApiHandlerTest.java
+++ b/serverless/src/test/java/com/iluwatar/serverless/baas/api/SavePersonApiHandlerTest.java
@@ -56,7 +56,7 @@ class SavePersonApiHandlerTest {
   private final ObjectMapper objectMapper = new ObjectMapper();
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     MockitoAnnotations.openMocks(this);
     this.savePersonApiHandler = new SavePersonApiHandler();
     this.savePersonApiHandler.setDynamoDbMapper(dynamoDbMapper);
diff --git a/service-layer/src/test/java/com/iluwatar/servicelayer/common/BaseDaoTest.java b/service-layer/src/test/java/com/iluwatar/servicelayer/common/BaseDaoTest.java
index fa1c1b144..f3f8a2377 100644
--- a/service-layer/src/test/java/com/iluwatar/servicelayer/common/BaseDaoTest.java
+++ b/service-layer/src/test/java/com/iluwatar/servicelayer/common/BaseDaoTest.java
@@ -76,7 +76,7 @@ public abstract class BaseDaoTest<E extends BaseEntity, D extends DaoBaseImpl<E>
   }
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     for (int i = 0; i < INITIAL_COUNT; i++) {
       final var className = dao.persistentClass.getSimpleName();
       final var entityName = String.format("%s%d", className, ID_GENERATOR.incrementAndGet());
@@ -85,7 +85,7 @@ public abstract class BaseDaoTest<E extends BaseEntity, D extends DaoBaseImpl<E>
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     HibernateUtil.dropSession();
   }
 
diff --git a/sharding/src/test/java/com/iluwatar/sharding/HashShardManagerTest.java b/sharding/src/test/java/com/iluwatar/sharding/HashShardManagerTest.java
index 7b048d103..b5b5202dc 100644
--- a/sharding/src/test/java/com/iluwatar/sharding/HashShardManagerTest.java
+++ b/sharding/src/test/java/com/iluwatar/sharding/HashShardManagerTest.java
@@ -40,7 +40,7 @@ class HashShardManagerTest {
    * Initialize hashShardManager instance.
    */
   @BeforeEach
-  public void setup() {
+  void setup() {
     hashShardManager = new HashShardManager();
     var shard1 = new Shard(1);
     var shard2 = new Shard(2);
diff --git a/sharding/src/test/java/com/iluwatar/sharding/LookupShardManagerTest.java b/sharding/src/test/java/com/iluwatar/sharding/LookupShardManagerTest.java
index f1d147c8c..a8b8ab1da 100644
--- a/sharding/src/test/java/com/iluwatar/sharding/LookupShardManagerTest.java
+++ b/sharding/src/test/java/com/iluwatar/sharding/LookupShardManagerTest.java
@@ -42,7 +42,7 @@ class LookupShardManagerTest {
    * Initialize lookupShardManager instance.
    */
   @BeforeEach
-  public void setup() {
+  void setup() {
     lookupShardManager = new LookupShardManager();
     var shard1 = new Shard(1);
     var shard2 = new Shard(2);
diff --git a/sharding/src/test/java/com/iluwatar/sharding/RangeShardManagerTest.java b/sharding/src/test/java/com/iluwatar/sharding/RangeShardManagerTest.java
index 1535bd5b9..299adc622 100644
--- a/sharding/src/test/java/com/iluwatar/sharding/RangeShardManagerTest.java
+++ b/sharding/src/test/java/com/iluwatar/sharding/RangeShardManagerTest.java
@@ -40,7 +40,7 @@ class RangeShardManagerTest {
    * Initialize rangeShardManager instance.
    */
   @BeforeEach
-  public void setup() {
+  void setup() {
     rangeShardManager = new RangeShardManager();
     var shard1 = new Shard(1);
     var shard2 = new Shard(2);
diff --git a/sharding/src/test/java/com/iluwatar/sharding/ShardTest.java b/sharding/src/test/java/com/iluwatar/sharding/ShardTest.java
index d60ba0b35..7b18440a8 100644
--- a/sharding/src/test/java/com/iluwatar/sharding/ShardTest.java
+++ b/sharding/src/test/java/com/iluwatar/sharding/ShardTest.java
@@ -43,7 +43,7 @@ class ShardTest {
   private Shard shard;
 
   @BeforeEach
-  public void setup() {
+  void setup() {
     data = new Data(1, "test", Data.DataType.TYPE_1);
     shard = new Shard(1);
   }
diff --git a/singleton/src/test/java/com/iluwatar/singleton/EnumIvoryTowerTest.java b/singleton/src/test/java/com/iluwatar/singleton/EnumIvoryTowerTest.java
index 67b275759..a03501530 100644
--- a/singleton/src/test/java/com/iluwatar/singleton/EnumIvoryTowerTest.java
+++ b/singleton/src/test/java/com/iluwatar/singleton/EnumIvoryTowerTest.java
@@ -29,7 +29,7 @@ package com.iluwatar.singleton;
  *
  * @author Jeroen Meulemeester
  */
-public class EnumIvoryTowerTest extends SingletonTest<EnumIvoryTower> {
+class EnumIvoryTowerTest extends SingletonTest<EnumIvoryTower> {
 
   /**
    * Create a new singleton test instance using the given 'getInstance' method.
diff --git a/singleton/src/test/java/com/iluwatar/singleton/InitializingOnDemandHolderIdiomTest.java b/singleton/src/test/java/com/iluwatar/singleton/InitializingOnDemandHolderIdiomTest.java
index 66ff89d80..8391c4f09 100644
--- a/singleton/src/test/java/com/iluwatar/singleton/InitializingOnDemandHolderIdiomTest.java
+++ b/singleton/src/test/java/com/iluwatar/singleton/InitializingOnDemandHolderIdiomTest.java
@@ -29,7 +29,7 @@ package com.iluwatar.singleton;
  *
  * @author Jeroen Meulemeester
  */
-public class InitializingOnDemandHolderIdiomTest
+class InitializingOnDemandHolderIdiomTest
     extends SingletonTest<InitializingOnDemandHolderIdiom> {
 
   /**
diff --git a/singleton/src/test/java/com/iluwatar/singleton/IvoryTowerTest.java b/singleton/src/test/java/com/iluwatar/singleton/IvoryTowerTest.java
index 144656b59..4fb0c8d90 100644
--- a/singleton/src/test/java/com/iluwatar/singleton/IvoryTowerTest.java
+++ b/singleton/src/test/java/com/iluwatar/singleton/IvoryTowerTest.java
@@ -29,7 +29,7 @@ package com.iluwatar.singleton;
  *
  * @author Jeroen Meulemeester
  */
-public class IvoryTowerTest extends SingletonTest<IvoryTower> {
+class IvoryTowerTest extends SingletonTest<IvoryTower> {
 
   /**
    * Create a new singleton test instance using the given 'getInstance' method.
diff --git a/singleton/src/test/java/com/iluwatar/singleton/ThreadSafeLazyLoadedIvoryTowerTest.java b/singleton/src/test/java/com/iluwatar/singleton/ThreadSafeLazyLoadedIvoryTowerTest.java
index 1eeea336e..c1832016b 100644
--- a/singleton/src/test/java/com/iluwatar/singleton/ThreadSafeLazyLoadedIvoryTowerTest.java
+++ b/singleton/src/test/java/com/iluwatar/singleton/ThreadSafeLazyLoadedIvoryTowerTest.java
@@ -29,7 +29,7 @@ package com.iluwatar.singleton;
  *
  * @author Jeroen Meulemeester
  */
-public class ThreadSafeLazyLoadedIvoryTowerTest
+class ThreadSafeLazyLoadedIvoryTowerTest
     extends SingletonTest<ThreadSafeLazyLoadedIvoryTower> {
 
   /**
diff --git a/special-case/src/test/java/com/iluwatar/specialcase/AppTest.java b/special-case/src/test/java/com/iluwatar/specialcase/AppTest.java
index b40e3c0b3..a571024a5 100644
--- a/special-case/src/test/java/com/iluwatar/specialcase/AppTest.java
+++ b/special-case/src/test/java/com/iluwatar/specialcase/AppTest.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Application test.
  */
-public class AppTest {
+class AppTest {
 
   @Test
   void shouldExecuteWithoutException() {
diff --git a/special-case/src/test/java/com/iluwatar/specialcase/SpecialCasesTest.java b/special-case/src/test/java/com/iluwatar/specialcase/SpecialCasesTest.java
index 132f324ee..83048bb05 100644
--- a/special-case/src/test/java/com/iluwatar/specialcase/SpecialCasesTest.java
+++ b/special-case/src/test/java/com/iluwatar/specialcase/SpecialCasesTest.java
@@ -40,7 +40,7 @@ import org.junit.jupiter.api.BeforeEach;
 /**
  * Special cases unit tests. (including the successful scenario {@link ReceiptDto})
  */
-public class SpecialCasesTest {
+class SpecialCasesTest {
   private static ApplicationServices applicationServices;
   private static ReceiptViewModel receipt;
 
@@ -54,12 +54,12 @@ public class SpecialCasesTest {
   }
 
   @BeforeEach
-  public void beforeEach() {
+  void beforeEach() {
     MaintenanceLock.getInstance().setLock(false);
   }
 
   @Test
-  public void testDownForMaintenance() {
+  void testDownForMaintenance() {
     final Logger LOGGER = (Logger) LoggerFactory.getLogger(DownForMaintenance.class);
 
     ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
@@ -76,7 +76,7 @@ public class SpecialCasesTest {
   }
 
   @Test
-  public void testInvalidUser() {
+  void testInvalidUser() {
     final Logger LOGGER = (Logger) LoggerFactory.getLogger(InvalidUser.class);
 
     ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
@@ -92,7 +92,7 @@ public class SpecialCasesTest {
   }
 
   @Test
-  public void testOutOfStock() {
+  void testOutOfStock() {
     final Logger LOGGER = (Logger) LoggerFactory.getLogger(OutOfStock.class);
 
     ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
@@ -109,7 +109,7 @@ public class SpecialCasesTest {
   }
 
   @Test
-  public void testInsufficientFunds() {
+  void testInsufficientFunds() {
     final Logger LOGGER = (Logger) LoggerFactory.getLogger(InsufficientFunds.class);
 
     ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
@@ -126,7 +126,7 @@ public class SpecialCasesTest {
   }
 
   @Test
-  public void testReceiptDto() {
+  void testReceiptDto() {
     final Logger LOGGER = (Logger) LoggerFactory.getLogger(ReceiptDto.class);
 
     ListAppender<ILoggingEvent> listAppender = new ListAppender<>();
diff --git a/specification/src/test/java/com/iluwatar/specification/selector/MassSelectorTest.java b/specification/src/test/java/com/iluwatar/specification/selector/MassSelectorTest.java
index a48af15ee..b4697b60f 100644
--- a/specification/src/test/java/com/iluwatar/specification/selector/MassSelectorTest.java
+++ b/specification/src/test/java/com/iluwatar/specification/selector/MassSelectorTest.java
@@ -33,7 +33,7 @@ import com.iluwatar.specification.creature.Creature;
 import com.iluwatar.specification.property.Mass;
 import org.junit.jupiter.api.Test;
 
-public class MassSelectorTest {
+class MassSelectorTest {
 
   /**
    * Verify if the mass selector gives the correct results.
diff --git a/specification/src/test/java/com/iluwatar/specification/selector/MovementSelectorTest.java b/specification/src/test/java/com/iluwatar/specification/selector/MovementSelectorTest.java
index cd10c6a76..e35f09da4 100644
--- a/specification/src/test/java/com/iluwatar/specification/selector/MovementSelectorTest.java
+++ b/specification/src/test/java/com/iluwatar/specification/selector/MovementSelectorTest.java
@@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class MovementSelectorTest {
+class MovementSelectorTest {
 
   /**
    * Verify if the movement selector gives the correct results.
diff --git a/specification/src/test/java/com/iluwatar/specification/selector/SizeSelectorTest.java b/specification/src/test/java/com/iluwatar/specification/selector/SizeSelectorTest.java
index 754797148..7584743fd 100644
--- a/specification/src/test/java/com/iluwatar/specification/selector/SizeSelectorTest.java
+++ b/specification/src/test/java/com/iluwatar/specification/selector/SizeSelectorTest.java
@@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class SizeSelectorTest {
+class SizeSelectorTest {
 
   /**
    * Verify if the size selector gives the correct results
diff --git a/state/src/test/java/com/iluwatar/state/MammothTest.java b/state/src/test/java/com/iluwatar/state/MammothTest.java
index da7804555..8479c4738 100644
--- a/state/src/test/java/com/iluwatar/state/MammothTest.java
+++ b/state/src/test/java/com/iluwatar/state/MammothTest.java
@@ -42,17 +42,17 @@ import org.slf4j.LoggerFactory;
  *
  * @author Jeroen Meulemeester
  */
-public class MammothTest {
+class MammothTest {
 
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
diff --git a/step-builder/src/test/java/com/iluwatar/stepbuilder/CharacterStepBuilderTest.java b/step-builder/src/test/java/com/iluwatar/stepbuilder/CharacterStepBuilderTest.java
index d3f4491bf..4df8e788d 100644
--- a/step-builder/src/test/java/com/iluwatar/stepbuilder/CharacterStepBuilderTest.java
+++ b/step-builder/src/test/java/com/iluwatar/stepbuilder/CharacterStepBuilderTest.java
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class CharacterStepBuilderTest {
+class CharacterStepBuilderTest {
 
   /**
    * Build a new wizard {@link Character} and verify if it has the expected attributes
diff --git a/strangler/src/test/java/com/iluwatar/strangler/HalfSourceTest.java b/strangler/src/test/java/com/iluwatar/strangler/HalfSourceTest.java
index a6b9c1b2d..4b6926a0c 100644
--- a/strangler/src/test/java/com/iluwatar/strangler/HalfSourceTest.java
+++ b/strangler/src/test/java/com/iluwatar/strangler/HalfSourceTest.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Test methods in HalfSource
  */
-public class HalfSourceTest {
+class HalfSourceTest {
   private static final HalfSource source = new HalfSource();
 
   @Test
diff --git a/strangler/src/test/java/com/iluwatar/strangler/NewSourceTest.java b/strangler/src/test/java/com/iluwatar/strangler/NewSourceTest.java
index 7f00b7f19..2ceb745ee 100644
--- a/strangler/src/test/java/com/iluwatar/strangler/NewSourceTest.java
+++ b/strangler/src/test/java/com/iluwatar/strangler/NewSourceTest.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Test methods in NewSource
  */
-public class NewSourceTest {
+class NewSourceTest {
   private static final NewSource source = new NewSource();
 
   @Test
diff --git a/strangler/src/test/java/com/iluwatar/strangler/OldSourceTest.java b/strangler/src/test/java/com/iluwatar/strangler/OldSourceTest.java
index fbb89b8fb..cb1d1b331 100644
--- a/strangler/src/test/java/com/iluwatar/strangler/OldSourceTest.java
+++ b/strangler/src/test/java/com/iluwatar/strangler/OldSourceTest.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Test methods in OldSource
  */
-public class OldSourceTest {
+class OldSourceTest {
   private static final OldSource source = new OldSource();
 
   @Test
diff --git a/strategy/src/test/java/com/iluwatar/strategy/DragonSlayerTest.java b/strategy/src/test/java/com/iluwatar/strategy/DragonSlayerTest.java
index 5f269f0f8..6753a9fa8 100644
--- a/strategy/src/test/java/com/iluwatar/strategy/DragonSlayerTest.java
+++ b/strategy/src/test/java/com/iluwatar/strategy/DragonSlayerTest.java
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class DragonSlayerTest {
+class DragonSlayerTest {
 
   /**
    * Verify if the dragon slayer uses the strategy during battle.
diff --git a/strategy/src/test/java/com/iluwatar/strategy/DragonSlayingStrategyTest.java b/strategy/src/test/java/com/iluwatar/strategy/DragonSlayingStrategyTest.java
index 842672ccd..c01b9d3be 100644
--- a/strategy/src/test/java/com/iluwatar/strategy/DragonSlayingStrategyTest.java
+++ b/strategy/src/test/java/com/iluwatar/strategy/DragonSlayingStrategyTest.java
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author Jeroen Meulemeester
  */
-public class DragonSlayingStrategyTest {
+class DragonSlayingStrategyTest {
 
   /**
    * Assembles test parameters.
@@ -70,12 +70,12 @@ public class DragonSlayingStrategyTest {
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
@@ -85,7 +85,7 @@ public class DragonSlayingStrategyTest {
    */
   @ParameterizedTest
   @MethodSource("dataProvider")
-  public void testExecute(DragonSlayingStrategy strategy, String expectedResult) {
+  void testExecute(DragonSlayingStrategy strategy, String expectedResult) {
     strategy.execute();
     assertEquals(expectedResult, appender.getLastMessage());
     assertEquals(1, appender.getLogSize());
diff --git a/template-method/src/test/java/com/iluwatar/templatemethod/HalflingThiefTest.java b/template-method/src/test/java/com/iluwatar/templatemethod/HalflingThiefTest.java
index 9f8025973..bf43d88b7 100644
--- a/template-method/src/test/java/com/iluwatar/templatemethod/HalflingThiefTest.java
+++ b/template-method/src/test/java/com/iluwatar/templatemethod/HalflingThiefTest.java
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class HalflingThiefTest {
+class HalflingThiefTest {
 
   /**
    * Verify if the thief uses the provided stealing method
diff --git a/template-method/src/test/java/com/iluwatar/templatemethod/HitAndRunMethodTest.java b/template-method/src/test/java/com/iluwatar/templatemethod/HitAndRunMethodTest.java
index e493f5995..fb185e895 100644
--- a/template-method/src/test/java/com/iluwatar/templatemethod/HitAndRunMethodTest.java
+++ b/template-method/src/test/java/com/iluwatar/templatemethod/HitAndRunMethodTest.java
@@ -29,7 +29,7 @@ package com.iluwatar.templatemethod;
  *
  * @author Jeroen Meulemeester
  */
-public class HitAndRunMethodTest extends StealingMethodTest<HitAndRunMethod> {
+class HitAndRunMethodTest extends StealingMethodTest<HitAndRunMethod> {
 
   /**
    * Create a new test for the {@link HitAndRunMethod}
diff --git a/template-method/src/test/java/com/iluwatar/templatemethod/StealingMethodTest.java b/template-method/src/test/java/com/iluwatar/templatemethod/StealingMethodTest.java
index b666b410e..c8bc832e9 100644
--- a/template-method/src/test/java/com/iluwatar/templatemethod/StealingMethodTest.java
+++ b/template-method/src/test/java/com/iluwatar/templatemethod/StealingMethodTest.java
@@ -48,12 +48,12 @@ public abstract class StealingMethodTest<M extends StealingMethod> {
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
diff --git a/template-method/src/test/java/com/iluwatar/templatemethod/SubtleMethodTest.java b/template-method/src/test/java/com/iluwatar/templatemethod/SubtleMethodTest.java
index 4d77fb4ff..ca89e76b0 100644
--- a/template-method/src/test/java/com/iluwatar/templatemethod/SubtleMethodTest.java
+++ b/template-method/src/test/java/com/iluwatar/templatemethod/SubtleMethodTest.java
@@ -29,7 +29,7 @@ package com.iluwatar.templatemethod;
  *
  * @author Jeroen Meulemeester
  */
-public class SubtleMethodTest extends StealingMethodTest<SubtleMethod> {
+class SubtleMethodTest extends StealingMethodTest<SubtleMethod> {
 
   /**
    * Create a new test for the {@link SubtleMethod}
diff --git a/thread-pool/src/test/java/com/iluwatar/threadpool/CoffeeMakingTaskTest.java b/thread-pool/src/test/java/com/iluwatar/threadpool/CoffeeMakingTaskTest.java
index 9c90ecfa6..f24bdc2cf 100644
--- a/thread-pool/src/test/java/com/iluwatar/threadpool/CoffeeMakingTaskTest.java
+++ b/thread-pool/src/test/java/com/iluwatar/threadpool/CoffeeMakingTaskTest.java
@@ -29,7 +29,7 @@ package com.iluwatar.threadpool;
  *
  * @author Jeroen Meulemeester
  */
-public class CoffeeMakingTaskTest extends TaskTest<CoffeeMakingTask> {
+class CoffeeMakingTaskTest extends TaskTest<CoffeeMakingTask> {
 
   /**
    * Create a new test instance
diff --git a/thread-pool/src/test/java/com/iluwatar/threadpool/PotatoPeelingTaskTest.java b/thread-pool/src/test/java/com/iluwatar/threadpool/PotatoPeelingTaskTest.java
index 448118a04..e8b5e1003 100644
--- a/thread-pool/src/test/java/com/iluwatar/threadpool/PotatoPeelingTaskTest.java
+++ b/thread-pool/src/test/java/com/iluwatar/threadpool/PotatoPeelingTaskTest.java
@@ -29,7 +29,7 @@ package com.iluwatar.threadpool;
  *
  * @author Jeroen Meulemeester
  */
-public class PotatoPeelingTaskTest extends TaskTest<PotatoPeelingTask> {
+class PotatoPeelingTaskTest extends TaskTest<PotatoPeelingTask> {
 
   /**
    * Create a new test instance
diff --git a/thread-pool/src/test/java/com/iluwatar/threadpool/WorkerTest.java b/thread-pool/src/test/java/com/iluwatar/threadpool/WorkerTest.java
index 3530f708d..9f9bd72e1 100644
--- a/thread-pool/src/test/java/com/iluwatar/threadpool/WorkerTest.java
+++ b/thread-pool/src/test/java/com/iluwatar/threadpool/WorkerTest.java
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Jeroen Meulemeester
  */
-public class WorkerTest {
+class WorkerTest {
 
   /**
    * Verify if a worker does the actual job
diff --git a/throttling/src/test/java/com/iluwatar/throttling/BarCustomerTest.java b/throttling/src/test/java/com/iluwatar/throttling/BarCustomerTest.java
index e72d54177..6ad90e05e 100644
--- a/throttling/src/test/java/com/iluwatar/throttling/BarCustomerTest.java
+++ b/throttling/src/test/java/com/iluwatar/throttling/BarCustomerTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 /**
  * TenantTest to test the creation of Tenant with valid parameters.
  */
-public class BarCustomerTest {
+class BarCustomerTest {
 
   @Test
   void constructorTest() {
diff --git a/throttling/src/test/java/com/iluwatar/throttling/BartenderTest.java b/throttling/src/test/java/com/iluwatar/throttling/BartenderTest.java
index ba6e08461..9d241eb6d 100644
--- a/throttling/src/test/java/com/iluwatar/throttling/BartenderTest.java
+++ b/throttling/src/test/java/com/iluwatar/throttling/BartenderTest.java
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
 /**
  * B2BServiceTest class to test the B2BService
  */
-public class BartenderTest {
+class BartenderTest {
 
   private final CallsCount callsCount = new CallsCount();
 
diff --git a/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTest.java b/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTest.java
index abfdb456e..3bd9497be 100644
--- a/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTest.java
+++ b/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTest.java
@@ -49,7 +49,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Thomas Bauer, January 2017
  */
-public class DateFormatCallableTest {
+class DateFormatCallableTest {
 
   // Class variables used in setup() have to be static because setup() has to be static
   /**
diff --git a/transaction-script/src/test/java/com/iluwatar/transactionscript/HotelDaoImplTest.java b/transaction-script/src/test/java/com/iluwatar/transactionscript/HotelDaoImplTest.java
index 8c86d9d08..ae288c703 100644
--- a/transaction-script/src/test/java/com/iluwatar/transactionscript/HotelDaoImplTest.java
+++ b/transaction-script/src/test/java/com/iluwatar/transactionscript/HotelDaoImplTest.java
@@ -47,7 +47,7 @@ import org.mockito.Mockito;
 /**
  * Tests {@link HotelDaoImpl}.
  */
-public class HotelDaoImplTest {
+class HotelDaoImplTest {
 
   private static final String DB_URL = "jdbc:h2:~/test";
   private HotelDaoImpl dao;
@@ -59,7 +59,7 @@ public class HotelDaoImplTest {
    * @throws SQLException if there is any error while creating schema.
    */
   @BeforeEach
-  public void createSchema() throws SQLException {
+  void createSchema() throws SQLException {
     try (var connection = DriverManager.getConnection(DB_URL);
          var statement = connection.createStatement()) {
       statement.execute(RoomSchemaSql.DELETE_SCHEMA_SQL);
@@ -71,7 +71,7 @@ public class HotelDaoImplTest {
    * Represents the scenario where DB connectivity is present.
    */
   @Nested
-  public class ConnectionSuccess {
+  class ConnectionSuccess {
 
     /**
      * Setup for connection success scenario.
@@ -79,7 +79,7 @@ public class HotelDaoImplTest {
      * @throws Exception if any error occurs.
      */
     @BeforeEach
-    public void setUp() throws Exception {
+    void setUp() throws Exception {
       var dataSource = new JdbcDataSource();
       dataSource.setURL(DB_URL);
       dao = new HotelDaoImpl(dataSource);
@@ -91,7 +91,7 @@ public class HotelDaoImplTest {
      * Represents the scenario when DAO operations are being performed on a non existing room.
      */
     @Nested
-    public class NonExistingRoom {
+    class NonExistingRoom {
 
       @Test
       void addingShouldResultInSuccess() throws Exception {
@@ -139,7 +139,7 @@ public class HotelDaoImplTest {
      * room.
      */
     @Nested
-    public class ExistingRoom {
+    class ExistingRoom {
 
       @Test
       void addingShouldResultInFailureAndNotAffectExistingRooms() throws Exception {
@@ -184,7 +184,7 @@ public class HotelDaoImplTest {
    * unavailable.
    */
   @Nested
-  public class ConnectivityIssue {
+  class ConnectivityIssue {
 
     private static final String EXCEPTION_CAUSE = "Connection not available";
 
@@ -194,7 +194,7 @@ public class HotelDaoImplTest {
      * @throws SQLException if any error occurs.
      */
     @BeforeEach
-    public void setUp() throws SQLException {
+    void setUp() throws SQLException {
       dao = new HotelDaoImpl(mockedDatasource());
     }
 
@@ -253,7 +253,7 @@ public class HotelDaoImplTest {
    * @throws SQLException if any error occurs.
    */
   @AfterEach
-  public void deleteSchema() throws SQLException {
+  void deleteSchema() throws SQLException {
     try (var connection = DriverManager.getConnection(DB_URL);
          var statement = connection.createStatement()) {
       statement.execute(RoomSchemaSql.DELETE_SCHEMA_SQL);
diff --git a/transaction-script/src/test/java/com/iluwatar/transactionscript/HotelTest.java b/transaction-script/src/test/java/com/iluwatar/transactionscript/HotelTest.java
index a4cb20a9d..1274a542a 100644
--- a/transaction-script/src/test/java/com/iluwatar/transactionscript/HotelTest.java
+++ b/transaction-script/src/test/java/com/iluwatar/transactionscript/HotelTest.java
@@ -45,7 +45,7 @@ class HotelTest {
   private HotelDaoImpl dao;
 
   @BeforeEach
-  public void setUp() throws Exception {
+  void setUp() throws Exception {
     final var dataSource = createDataSource();
     deleteSchema(dataSource);
     createSchema(dataSource);
diff --git a/twin/src/test/java/com/iluwatar/twin/BallItemTest.java b/twin/src/test/java/com/iluwatar/twin/BallItemTest.java
index c3cbddd5f..d13ff6698 100644
--- a/twin/src/test/java/com/iluwatar/twin/BallItemTest.java
+++ b/twin/src/test/java/com/iluwatar/twin/BallItemTest.java
@@ -46,17 +46,17 @@ import org.slf4j.LoggerFactory;
  *
  * @author Jeroen Meulemeester
  */
-public class BallItemTest {
+class BallItemTest {
 
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }
 
@@ -108,7 +108,7 @@ public class BallItemTest {
   /**
    * Logging Appender Implementation
    */
-  public class InMemoryAppender extends AppenderBase<ILoggingEvent> {
+  class InMemoryAppender extends AppenderBase<ILoggingEvent> {
     private final List<ILoggingEvent> log = new LinkedList<>();
 
     public InMemoryAppender() {
diff --git a/version-number/src/test/java/com/iluwatar/versionnumber/BookRepositoryTest.java b/version-number/src/test/java/com/iluwatar/versionnumber/BookRepositoryTest.java
index 4ea60a70f..b480cfd41 100644
--- a/version-number/src/test/java/com/iluwatar/versionnumber/BookRepositoryTest.java
+++ b/version-number/src/test/java/com/iluwatar/versionnumber/BookRepositoryTest.java
@@ -37,7 +37,7 @@ class BookRepositoryTest {
   private final BookRepository bookRepository = new BookRepository();
 
   @BeforeEach
-  public void setUp() throws BookDuplicateException {
+  void setUp() throws BookDuplicateException {
     var book = new Book();
     book.setId(bookId);
     bookRepository.add(book);
diff --git a/visitor/src/test/java/com/iluwatar/visitor/CommanderTest.java b/visitor/src/test/java/com/iluwatar/visitor/CommanderTest.java
index 27df66894..4b90c69cc 100644
--- a/visitor/src/test/java/com/iluwatar/visitor/CommanderTest.java
+++ b/visitor/src/test/java/com/iluwatar/visitor/CommanderTest.java
@@ -32,7 +32,7 @@ import static org.mockito.Mockito.verify;
  *
  * @author Jeroen Meulemeester
  */
-public class CommanderTest extends UnitTest<Commander> {
+class CommanderTest extends UnitTest<Commander> {
 
   /**
    * Create a new test instance for the given {@link Commander}.
diff --git a/visitor/src/test/java/com/iluwatar/visitor/CommanderVisitorTest.java b/visitor/src/test/java/com/iluwatar/visitor/CommanderVisitorTest.java
index 7b9ed311b..4bd3fbb09 100644
--- a/visitor/src/test/java/com/iluwatar/visitor/CommanderVisitorTest.java
+++ b/visitor/src/test/java/com/iluwatar/visitor/CommanderVisitorTest.java
@@ -31,7 +31,7 @@ import java.util.Optional;
  *
  * @author Jeroen Meulemeester
  */
-public class CommanderVisitorTest extends VisitorTest<CommanderVisitor> {
+class CommanderVisitorTest extends VisitorTest<CommanderVisitor> {
 
   /**
    * Create a new test instance for the given visitor.
diff --git a/visitor/src/test/java/com/iluwatar/visitor/SergeantTest.java b/visitor/src/test/java/com/iluwatar/visitor/SergeantTest.java
index 968c6afcb..7aeed4ed1 100644
--- a/visitor/src/test/java/com/iluwatar/visitor/SergeantTest.java
+++ b/visitor/src/test/java/com/iluwatar/visitor/SergeantTest.java
@@ -32,7 +32,7 @@ import static org.mockito.Mockito.verify;
  *
  * @author Jeroen Meulemeester
  */
-public class SergeantTest extends UnitTest<Sergeant> {
+class SergeantTest extends UnitTest<Sergeant> {
 
   /**
    * Create a new test instance for the given {@link Sergeant}.
diff --git a/visitor/src/test/java/com/iluwatar/visitor/SergeantVisitorTest.java b/visitor/src/test/java/com/iluwatar/visitor/SergeantVisitorTest.java
index f8a61b94d..a543ed3ef 100644
--- a/visitor/src/test/java/com/iluwatar/visitor/SergeantVisitorTest.java
+++ b/visitor/src/test/java/com/iluwatar/visitor/SergeantVisitorTest.java
@@ -31,7 +31,7 @@ import java.util.Optional;
  *
  * @author Jeroen Meulemeester
  */
-public class SergeantVisitorTest extends VisitorTest<SergeantVisitor> {
+class SergeantVisitorTest extends VisitorTest<SergeantVisitor> {
 
   /**
    * Create a new test instance for the given visitor.
diff --git a/visitor/src/test/java/com/iluwatar/visitor/SoldierTest.java b/visitor/src/test/java/com/iluwatar/visitor/SoldierTest.java
index f449911e4..0fc45680c 100644
--- a/visitor/src/test/java/com/iluwatar/visitor/SoldierTest.java
+++ b/visitor/src/test/java/com/iluwatar/visitor/SoldierTest.java
@@ -32,7 +32,7 @@ import static org.mockito.Mockito.verify;
  *
  * @author Jeroen Meulemeester
  */
-public class SoldierTest extends UnitTest<Soldier> {
+class SoldierTest extends UnitTest<Soldier> {
 
   /**
    * Create a new test instance for the given {@link Soldier}.
diff --git a/visitor/src/test/java/com/iluwatar/visitor/SoldierVisitorTest.java b/visitor/src/test/java/com/iluwatar/visitor/SoldierVisitorTest.java
index 599326275..108a6dc4a 100644
--- a/visitor/src/test/java/com/iluwatar/visitor/SoldierVisitorTest.java
+++ b/visitor/src/test/java/com/iluwatar/visitor/SoldierVisitorTest.java
@@ -31,7 +31,7 @@ import java.util.Optional;
  *
  * @author Jeroen Meulemeester
  */
-public class SoldierVisitorTest extends VisitorTest<SoldierVisitor> {
+class SoldierVisitorTest extends VisitorTest<SoldierVisitor> {
 
   /**
    * Create a new test instance for the given visitor.
diff --git a/visitor/src/test/java/com/iluwatar/visitor/VisitorTest.java b/visitor/src/test/java/com/iluwatar/visitor/VisitorTest.java
index ff4c43602..cfec06a96 100644
--- a/visitor/src/test/java/com/iluwatar/visitor/VisitorTest.java
+++ b/visitor/src/test/java/com/iluwatar/visitor/VisitorTest.java
@@ -48,12 +48,12 @@ public abstract class VisitorTest<V extends UnitVisitor> {
   private InMemoryAppender appender;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     appender = new InMemoryAppender();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     appender.stop();
   }