diff --git a/src/test/BaseSetup.java b/src/test/BaseSetup.java
index 0d27c18..df2c40b 100644
--- a/src/test/BaseSetup.java
+++ b/src/test/BaseSetup.java
@@ -31,7 +31,7 @@
 import okhttp3.OkHttpClient;
 import org.junit.jupiter.api.BeforeEach;
 
-public class BaseSetup extends BaseWireMockTest {
+class BaseSetup extends BaseWireMockTest {
 
     protected StandardCheckoutClient standardCheckoutClient;
 
diff --git a/src/test/BaseSetupWithOAuth.java b/src/test/BaseSetupWithOAuth.java
index 1cae7e2..8af180e 100644
--- a/src/test/BaseSetupWithOAuth.java
+++ b/src/test/BaseSetupWithOAuth.java
@@ -22,7 +22,7 @@
 import wiremock.org.apache.http.HttpStatus;
 
 // Cannot mock TokenService as it is getting created inside the StandardCheckoutClient
-public class BaseSetupWithOAuth extends BaseSetup {
+class BaseSetupWithOAuth extends BaseSetup {
 
     OAuthResponse oAuthResponse;
 
diff --git a/src/test/CallbackTest.java b/src/test/CallbackTest.java
index 9399ec2..bbd345e 100644
--- a/src/test/CallbackTest.java
+++ b/src/test/CallbackTest.java
@@ -39,7 +39,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-public class CallbackTest extends BaseSetup {
+class CallbackTest extends BaseSetup {
 
     @Test
     void test_ENTIRE_PG_ORDER_COMPLETED() {
diff --git a/src/test/CancelSubscriptionTest.java b/src/test/CancelSubscriptionTest.java
index 2900b38..9dfd121 100644
--- a/src/test/CancelSubscriptionTest.java
+++ b/src/test/CancelSubscriptionTest.java
@@ -23,7 +23,7 @@
 import org.junit.jupiter.api.Test;
 import wiremock.org.apache.http.HttpStatus;
 
-public class CancelSubscriptionTest extends BaseSetupWithOAuth {
+class CancelSubscriptionTest extends BaseSetupWithOAuth {
 
     @Test
     void testCancelSubscription() {
diff --git a/src/test/CreateOrderTest.java b/src/test/CreateOrderTest.java
index 92eb03d..ca11aa0 100644
--- a/src/test/CreateOrderTest.java
+++ b/src/test/CreateOrderTest.java
@@ -28,7 +28,7 @@
 import org.junit.jupiter.api.Test;
 import wiremock.org.apache.http.HttpStatus;
 
-public class CreateOrderTest extends BaseSetupWithOAuth {
+class CreateOrderTest extends BaseSetupWithOAuth {
 
     @Test
     void testCreateOrder() {
diff --git a/src/test/EventPublisherTest.java b/src/test/EventPublisherTest.java
index 02c57da..aec463e 100644
--- a/src/test/EventPublisherTest.java
+++ b/src/test/EventPublisherTest.java
@@ -47,7 +47,7 @@
 import org.junit.jupiter.api.Test;
 import wiremock.org.apache.http.HttpStatus;
 
-public class EventPublisherTest extends BaseSetupWithOAuth {
+class EventPublisherTest extends BaseSetupWithOAuth {
 
     private EventPublisher eventPublisher;
     private EventQueue eventQueue;
diff --git a/src/test/ExceptionTest.java b/src/test/ExceptionTest.java
index deef1be..aa4c66e 100644
--- a/src/test/ExceptionTest.java
+++ b/src/test/ExceptionTest.java
@@ -24,7 +24,7 @@
 import org.junit.jupiter.api.Test;
 import wiremock.org.apache.http.HttpStatus;
 
-public class ExceptionTest extends BaseSetupWithOAuth {
+class ExceptionTest extends BaseSetupWithOAuth {
 
     @Test
     void testR999() {
diff --git a/src/test/HttpCommandTest.java b/src/test/HttpCommandTest.java
index 390006a..1defdcf 100644
--- a/src/test/HttpCommandTest.java
+++ b/src/test/HttpCommandTest.java
@@ -26,7 +26,7 @@
 import org.junit.jupiter.api.Test;
 import wiremock.org.apache.http.HttpStatus;
 
-public class HttpCommandTest extends BaseSetup {
+class HttpCommandTest extends BaseSetup {
 
     @Test
     public void testHttpCommand200() {
diff --git a/src/test/OrderStatusTest.java b/src/test/OrderStatusTest.java
index f2b2f26..3f95c3b 100644
--- a/src/test/OrderStatusTest.java
+++ b/src/test/OrderStatusTest.java
@@ -46,7 +46,7 @@
 import org.junit.jupiter.api.Test;
 import wiremock.org.apache.http.HttpStatus;
 
-public class OrderStatusTest extends BaseSetupWithOAuth {
+class OrderStatusTest extends BaseSetupWithOAuth {
 
     @Test
     void orderStatusReturnSuccess() {
diff --git a/src/test/PayTest.java b/src/test/PayTest.java
index 456b66c..82f6014 100644
--- a/src/test/PayTest.java
+++ b/src/test/PayTest.java
@@ -43,7 +43,7 @@
 import org.junit.jupiter.api.Test;
 import wiremock.org.apache.http.HttpStatus;
 
-public class PayTest extends BaseSetupWithOAuth {
+class PayTest extends BaseSetupWithOAuth {
 
     @SneakyThrows
     @Test
diff --git a/src/test/RefundTest.java b/src/test/RefundTest.java
index b655767..ba02c7f 100644
--- a/src/test/RefundTest.java
+++ b/src/test/RefundTest.java
@@ -32,7 +32,7 @@
 import org.junit.jupiter.api.Test;
 import wiremock.org.apache.http.HttpStatus;
 
-public class RefundTest extends BaseSetupWithOAuth {
+class RefundTest extends BaseSetupWithOAuth {
 
     @Test
     void testRefundSuccess() {
diff --git a/src/test/SingletonCustomCheckoutTest.java b/src/test/SingletonCustomCheckoutTest.java
index 89b5462..360255b 100644
--- a/src/test/SingletonCustomCheckoutTest.java
+++ b/src/test/SingletonCustomCheckoutTest.java
@@ -31,7 +31,7 @@
 import org.junit.jupiter.api.Test;
 import wiremock.org.apache.http.HttpStatus;
 
-public class SingletonCustomCheckoutTest extends BaseSetup {
+class SingletonCustomCheckoutTest extends BaseSetup {
 
     FormBody formBody =
             new FormBody.Builder()
diff --git a/src/test/SingletonEventPublisherTest.java b/src/test/SingletonEventPublisherTest.java
index 1d3d2f4..ea4f0b0 100644
--- a/src/test/SingletonEventPublisherTest.java
+++ b/src/test/SingletonEventPublisherTest.java
@@ -20,7 +20,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-public class SingletonEventPublisherTest {
+class SingletonEventPublisherTest {
 
     @Test
     void testEventPublisherWithDifferentClients() {
diff --git a/src/test/SingletonStandardCheckoutTest.java b/src/test/SingletonStandardCheckoutTest.java
index e5412a7..09abc77 100644
--- a/src/test/SingletonStandardCheckoutTest.java
+++ b/src/test/SingletonStandardCheckoutTest.java
@@ -35,7 +35,7 @@
 import org.junit.jupiter.api.Test;
 import wiremock.org.apache.http.HttpStatus;
 
-public class SingletonStandardCheckoutTest extends BaseSetup {
+class SingletonStandardCheckoutTest extends BaseSetup {
 
     FormBody formBody =
             new FormBody.Builder()
diff --git a/src/test/SingletonTest.java b/src/test/SingletonTest.java
index a680904..298f2a2 100644
--- a/src/test/SingletonTest.java
+++ b/src/test/SingletonTest.java
@@ -29,7 +29,7 @@
 import org.junit.jupiter.api.Test;
 import wiremock.org.apache.http.HttpStatus;
 
-public class SingletonTest extends BaseSetupWithOAuth {
+class SingletonTest extends BaseSetupWithOAuth {
 
     @Test
     void testSingletonViaGetInstance() {
diff --git a/src/test/SubscriptionNotifyTest.java b/src/test/SubscriptionNotifyTest.java
index 59a4446..79ae89b 100644
--- a/src/test/SubscriptionNotifyTest.java
+++ b/src/test/SubscriptionNotifyTest.java
@@ -30,7 +30,7 @@
 import org.junit.jupiter.api.Test;
 import wiremock.org.apache.http.HttpStatus;
 
-public class SubscriptionNotifyTest extends BaseSetupWithOAuth {
+class SubscriptionNotifyTest extends BaseSetupWithOAuth {
 
     @Test
     void testNotifySuccess() {
diff --git a/src/test/SubscriptionRedeemTest.java b/src/test/SubscriptionRedeemTest.java
index 92a81e3..4ac7d7e 100644
--- a/src/test/SubscriptionRedeemTest.java
+++ b/src/test/SubscriptionRedeemTest.java
@@ -28,7 +28,7 @@
 import org.junit.jupiter.api.Test;
 import wiremock.org.apache.http.HttpStatus;
 
-public class SubscriptionRedeemTest extends BaseSetupWithOAuth {
+class SubscriptionRedeemTest extends BaseSetupWithOAuth {
 
     @Test
     void testRedeemSuccess() {
diff --git a/src/test/SubscriptionSetupTest.java b/src/test/SubscriptionSetupTest.java
index 7b6a515..5e27e95 100644
--- a/src/test/SubscriptionSetupTest.java
+++ b/src/test/SubscriptionSetupTest.java
@@ -29,7 +29,7 @@
 import org.junit.jupiter.api.Test;
 import wiremock.org.apache.http.HttpStatus;
 
-public class SubscriptionSetupTest extends BaseSetupWithOAuth {
+class SubscriptionSetupTest extends BaseSetupWithOAuth {
 
     @Test
     void testSetupViaUpiIntentSuccess() {
diff --git a/src/test/SubscriptionStatusResponse.java b/src/test/SubscriptionStatusResponse.java
index b687e8b..6c47a43 100644
--- a/src/test/SubscriptionStatusResponse.java
+++ b/src/test/SubscriptionStatusResponse.java
@@ -29,7 +29,7 @@
 import org.junit.jupiter.api.Test;
 import wiremock.org.apache.http.HttpStatus;
 
-public class SubscriptionStatusResponse extends BaseSetupWithOAuth {
+class SubscriptionStatusResponse extends BaseSetupWithOAuth {
 
     @Test
     void testSubscriptionStatusSuccess() {
diff --git a/src/test/TokenServiceTest.java b/src/test/TokenServiceTest.java
index 5b55b40..225b147 100644
--- a/src/test/TokenServiceTest.java
+++ b/src/test/TokenServiceTest.java
@@ -47,7 +47,7 @@
 import org.junit.jupiter.api.Test;
 import wiremock.org.apache.http.HttpStatus;
 
-public class TokenServiceTest extends BaseSetup {
+class TokenServiceTest extends BaseSetup {
 
     protected String formDataToString(FormBody formBody) {
         StringBuilder builder = new StringBuilder();
diff --git a/src/test/TransactionTest.java b/src/test/TransactionTest.java
index 5bc86e2..8c7e09e 100644
--- a/src/test/TransactionTest.java
+++ b/src/test/TransactionTest.java
@@ -25,7 +25,7 @@
 import org.junit.jupiter.api.Test;
 import wiremock.org.apache.http.HttpStatus;
 
-public class TransactionTest extends BaseSetupWithOAuth {
+class TransactionTest extends BaseSetupWithOAuth {
 
     String transactionId = "transactionId";
 
diff --git a/src/test/UtilTest.java b/src/test/UtilTest.java
index 605af3d..758a033 100644
--- a/src/test/UtilTest.java
+++ b/src/test/UtilTest.java
@@ -18,7 +18,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-public class UtilTest {
+class UtilTest {
 
     @Test
     void testSha256SuccessFor5Parameters() {