Sonar fixes

JUnit5 test classes and methods should have default package visibility

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1885326 13f79535-47bb-0310-9956-ffa450edef68

158 files changed, 158 insertions, 158 deletions

diff --git a/src/ooxml/testcases/org/apache/poi/extractor/ooxml/TestExtractorFactory.java b/src/ooxml/testcases/org/apache/poi/extractor/ooxml/TestExtractorFactory.java
index f6cf67d8d9..b94a3454de 100644
--- a/src/ooxml/testcases/org/apache/poi/extractor/ooxml/TestExtractorFactory.java
+++ b/src/ooxml/testcases/org/apache/poi/extractor/ooxml/TestExtractorFactory.java
@@ -58,7 +58,7 @@ import org.junit.jupiter.params.provider.ValueSource;
 /**
  * Test that the extractor factory plays nicely
  */
-public class TestExtractorFactory {
+class TestExtractorFactory {
 
     private static final POIDataSamples ssTests = POIDataSamples.getSpreadSheetInstance();
     private static final File xls = getFileAndCheck(ssTests, "SampleSS.xls");
diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/TestDetectAsOOXML.java b/src/ooxml/testcases/org/apache/poi/ooxml/TestDetectAsOOXML.java
index 11972f86d5..13e46c5222 100644
--- a/src/ooxml/testcases/org/apache/poi/ooxml/TestDetectAsOOXML.java
+++ b/src/ooxml/testcases/org/apache/poi/ooxml/TestDetectAsOOXML.java
@@ -40,7 +40,7 @@ import org.junit.jupiter.params.provider.CsvSource;
  *  documents
  */
 @SuppressWarnings("deprecation")
-public class TestDetectAsOOXML {
+class TestDetectAsOOXML {
     @Test
 	void testOpensProperly() throws IOException, InvalidFormatException {
     	try (InputStream is = openSampleFileStream("sample.xlsx");
diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/TestEmbedded.java b/src/ooxml/testcases/org/apache/poi/ooxml/TestEmbedded.java
index 8b36c6678c..e41193a3c8 100644
--- a/src/ooxml/testcases/org/apache/poi/ooxml/TestEmbedded.java
+++ b/src/ooxml/testcases/org/apache/poi/ooxml/TestEmbedded.java
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Class to test that we handle embeded bits in OOXML files properly
  */
-public class TestEmbedded {
+class TestEmbedded {
 	@Test
 	void testExcel() throws Exception {
 		POIXMLDocument doc = new XSSFWorkbook(
diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/TestTriggerCoverage.java b/src/ooxml/testcases/org/apache/poi/ooxml/TestTriggerCoverage.java
index a26aaf2a72..7745125ea4 100644
--- a/src/ooxml/testcases/org/apache/poi/ooxml/TestTriggerCoverage.java
+++ b/src/ooxml/testcases/org/apache/poi/ooxml/TestTriggerCoverage.java
@@ -56,7 +56,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
  * Test to trigger code-execution of various parts so
  * that all required elements are inclueded in the ooxml-schema-lite package
  */
-public class TestTriggerCoverage {
+class TestTriggerCoverage {
     private static final Set<String> FAILING = new HashSet<>();
     static {
         FAILING.add("stress025.docx");
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java
index fc047c887c..714d81180b 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java
+++ b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java
@@ -24,7 +24,7 @@ import java.net.URI;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.junit.jupiter.api.Test;
 
-public class TestPackagingURIHelper {
+class TestPackagingURIHelper {
 
     /**
      * Test relativizePartName() method.
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java
index 0afcfe4e1f..28e1941f89 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java
+++ b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java
@@ -36,7 +36,7 @@ import org.apache.poi.util.POILogger;
 import org.junit.jupiter.api.Test;
 
 
-public class TestRelationships {
+class TestRelationships {
 	private static final String HYPERLINK_REL_TYPE =
 		"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
 	private static final String COMMENTS_REL_TYPE =
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java
index 44ad08482b..e57fc1255e 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java
+++ b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java
@@ -44,7 +44,7 @@ import org.junit.jupiter.api.Test;
  * M1.11 : A package implementer shall neither create nor recognize a part with
  * a part name derived from another part name by appending segments to it.
  */
-public class TestOPCCompliancePackageModel {
+class TestOPCCompliancePackageModel {
 
     private static File TESTFILE;
 
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
index 96edca768f..3b9b03aed4 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
+++ b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
@@ -34,7 +34,7 @@ import org.apache.poi.openxml4j.opc.internal.PackagePropertiesPart;
 import org.apache.poi.openxml4j.opc.internal.PartMarshaller;
 import org.junit.jupiter.api.Test;
 
-public class TestZipPackagePropertiesMarshaller {
+class TestZipPackagePropertiesMarshaller {
     private final PartMarshaller marshaller = new ZipPackagePropertiesMarshaller();
 
     private boolean marshall() throws OpenXML4JException {
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/util/TestZipSecureFile.java b/src/ooxml/testcases/org/apache/poi/openxml4j/util/TestZipSecureFile.java
index 449b725d44..d80a44a1d8 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/util/TestZipSecureFile.java
+++ b/src/ooxml/testcases/org/apache/poi/openxml4j/util/TestZipSecureFile.java
@@ -27,7 +27,7 @@ import java.util.Enumeration;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class TestZipSecureFile {
+class TestZipSecureFile {
     @Test
     void testThresholdInputStream() throws Exception {
         // This fails in Java 10 because our reflection injection of the ThresholdInputStream causes a
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java
index b10c53f284..61eddc0d6e 100644
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java
+++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java
@@ -25,7 +25,7 @@ import org.apache.poi.poifs.crypt.HashAlgorithm;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-public class TestSignatureConfig {
+class TestSignatureConfig {
 
     @Test
     @Disabled("failing in automated builds, due to issues loading security classes")
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
index 92ad7edb75..f8b7de4453 100644
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
+++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
@@ -161,7 +161,7 @@ import org.w3.x2000.x09.xmldsig.ReferenceType;
 import org.w3.x2000.x09.xmldsig.SignatureDocument;
 import org.w3c.dom.Document;
 
-public class TestSignatureInfo {
+class TestSignatureInfo {
     private static final POILogger LOG = POILogFactory.getLogger(TestSignatureInfo.class);
     private static final POIDataSamples testdata = POIDataSamples.getXmlDSignInstance();
 
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java
index 3d41fe6304..14e6debbf4 100644
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java
+++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java
@@ -45,7 +45,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-public class TestAgileEncryptionParameters {
+class TestAgileEncryptionParameters {
 
     static byte[] testData;
 
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestDecryptor.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestDecryptor.java
index 6e852a393f..fed15e2f3c 100644
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestDecryptor.java
+++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestDecryptor.java
@@ -44,7 +44,7 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.util.IOUtils;
 import org.junit.jupiter.api.Test;
 
-public class TestDecryptor {
+class TestDecryptor {
     private static final POIDataSamples samples = POIDataSamples.getPOIFSInstance();
 
     @Test
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestEncryptionInfo.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestEncryptionInfo.java
index 5fd6f6e46f..879bf2d2a6 100644
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestEncryptionInfo.java
+++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestEncryptionInfo.java
@@ -28,7 +28,7 @@ import org.apache.poi.poifs.crypt.HashAlgorithm;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.junit.jupiter.api.Test;
 
-public class TestEncryptionInfo {
+class TestEncryptionInfo {
     @Test
     void testEncryptionInfo() throws IOException {
         POIFSFileSystem fs = new POIFSFileSystem(POIDataSamples.getPOIFSInstance().openResourceAsStream("protect.xlsx"));
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestEncryptor.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestEncryptor.java
index 5dbdcffdf1..ed2ee87e02 100644
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestEncryptor.java
+++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestEncryptor.java
@@ -66,7 +66,7 @@ import org.apache.poi.xwpf.usermodel.XWPFParagraph;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-public class TestEncryptor {
+class TestEncryptor {
     @Test
     void binaryRC4Encryption() throws Exception {
         // please contribute a real sample file, which is binary rc4 encrypted
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java
index d7c4396174..548e12ced9 100644
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java
+++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java
@@ -44,7 +44,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-public class TestHxxFEncryption {
+class TestHxxFEncryption {
     public static Stream<Arguments> data() throws IOException {
         final String base64 =
             "H4sIAAAAAAAAAF1Uu24bMRDs/RULVwkgCUhSpHaZwkDgpHJH8fZ0G/Nx4ZI6y13yG/mRfIb9R5mlZFlIpdPtcnZmdnjPf57/vvx6+f3h6obuv3"+
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestSecureTempZip.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestSecureTempZip.java
index 630a8856f5..7dbbbe3d2a 100644
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestSecureTempZip.java
+++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestSecureTempZip.java
@@ -43,7 +43,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.xmlbeans.XmlException;
 import org.junit.jupiter.api.Test;
 
-public class TestSecureTempZip {
+class TestSecureTempZip {
 
     /**
      * Test case for #59841 - this is an example on how to use encrypted temp files,
diff --git a/src/ooxml/testcases/org/apache/poi/sl/tests/TestFonts.java b/src/ooxml/testcases/org/apache/poi/sl/tests/TestFonts.java
index 33332ddb95..bd5d190d69 100644
--- a/src/ooxml/testcases/org/apache/poi/sl/tests/TestFonts.java
+++ b/src/ooxml/testcases/org/apache/poi/sl/tests/TestFonts.java
@@ -53,7 +53,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Test rendering - specific to font handling
  */
-public class TestFonts {
+class TestFonts {
     private static final POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
 
     private static final String JPTEXT =
diff --git a/src/ooxml/testcases/org/apache/poi/sl/tests/TestHeadersFooters.java b/src/ooxml/testcases/org/apache/poi/sl/tests/TestHeadersFooters.java
index 146be30567..bd0d0ccb85 100644
--- a/src/ooxml/testcases/org/apache/poi/sl/tests/TestHeadersFooters.java
+++ b/src/ooxml/testcases/org/apache/poi/sl/tests/TestHeadersFooters.java
@@ -33,7 +33,7 @@ import org.apache.poi.sl.usermodel.TextParagraph;
 import org.apache.poi.sl.usermodel.TextShape;
 import org.junit.jupiter.api.Test;
 
-public class TestHeadersFooters {
+class TestHeadersFooters {
     @Test
     void bug58144c() throws IOException {
         SlideShow<?,?> ppt = openSampleSlideshow("bug58144-headers-footers-2007.pptx");
diff --git a/src/ooxml/testcases/org/apache/poi/sl/tests/TestOleShape.java b/src/ooxml/testcases/org/apache/poi/sl/tests/TestOleShape.java
index 130129d7d6..bda636d2ad 100644
--- a/src/ooxml/testcases/org/apache/poi/sl/tests/TestOleShape.java
+++ b/src/ooxml/testcases/org/apache/poi/sl/tests/TestOleShape.java
@@ -61,7 +61,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-public class TestOleShape {
+class TestOleShape {
     private static final String PDF_SAMPLE =
         "H4sIAAAAAAAAAJWUezRUWxzHe+o2FXncVtxLpxi3FPOeKYspjMdM5J1S4TTOaDIzxzpzJo9CUrnrSiUxIeT" +
         "9jB7yqInihrhepTwqt1AT5VZCC7XcY0LWcv+5Z521zz6fvX+/vb/7t9cX78CyMiQZ0XD4W4OFEzgKQATgg4" +
diff --git a/src/ooxml/testcases/org/apache/poi/sl/tests/TestSlide.java b/src/ooxml/testcases/org/apache/poi/sl/tests/TestSlide.java
index b3afd41fa8..eb066e4688 100644
--- a/src/ooxml/testcases/org/apache/poi/sl/tests/TestSlide.java
+++ b/src/ooxml/testcases/org/apache/poi/sl/tests/TestSlide.java
@@ -35,7 +35,7 @@ import org.apache.poi.sl.usermodel.SlideShowFactory;
 import org.apache.poi.xslf.usermodel.XMLSlideShow;
 import org.junit.jupiter.api.Test;
 
-public class TestSlide {
+class TestSlide {
 
     @Test
     void hideHSLF() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/sl/tests/TestTable.java b/src/ooxml/testcases/org/apache/poi/sl/tests/TestTable.java
index 10761d9dd2..cedb11eed0 100644
--- a/src/ooxml/testcases/org/apache/poi/sl/tests/TestTable.java
+++ b/src/ooxml/testcases/org/apache/poi/sl/tests/TestTable.java
@@ -43,7 +43,7 @@ import org.apache.poi.sl.usermodel.TextShape.TextDirection;
 import org.apache.poi.xslf.usermodel.XMLSlideShow;
 import org.junit.jupiter.api.Test;
 
-public class TestTable {
+class TestTable {
 
     @Test
     void colWidthRowHeight() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java b/src/ooxml/testcases/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java
index 6a73596b68..0baa8a25e7 100644
--- a/src/ooxml/testcases/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java
+++ b/src/ooxml/testcases/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java
@@ -40,7 +40,7 @@ import org.apache.poi.util.Units;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-public class TestDrawPictureShape {
+class TestDrawPictureShape {
     final static POIDataSamples ssSamples = POIDataSamples.getSlideShowInstance();
 
     private static boolean xslfOnly;
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/extractor/TestEmbeddedExtractor.java b/src/ooxml/testcases/org/apache/poi/ss/tests/extractor/TestEmbeddedExtractor.java
index 57368ee1fd..ca3ec7d1fe 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/extractor/TestEmbeddedExtractor.java
+++ b/src/ooxml/testcases/org/apache/poi/ss/tests/extractor/TestEmbeddedExtractor.java
@@ -40,7 +40,7 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.junit.jupiter.api.Test;
 
-public class TestEmbeddedExtractor {
+class TestEmbeddedExtractor {
     private static final POIDataSamples samples = POIDataSamples.getSpreadSheetInstance();
 
     @Test
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/format/TestCellFormatPart.java b/src/ooxml/testcases/org/apache/poi/ss/tests/format/TestCellFormatPart.java
index 8978c1a4a4..8514542080 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/format/TestCellFormatPart.java
+++ b/src/ooxml/testcases/org/apache/poi/ss/tests/format/TestCellFormatPart.java
@@ -54,7 +54,7 @@ import org.junit.jupiter.api.Test;
  * flag "Categories" is not empty, only tests that have at least one category
  * listed in "Categories" are run.
  */
-public class TestCellFormatPart {
+class TestCellFormatPart {
     private static final Pattern NUMBER_EXTRACT_FMT = Pattern.compile(
             "([-+]?[0-9]+)(\\.[0-9]+)?.*(?:(e).*?([+-]?[0-9]+))",
             Pattern.CASE_INSENSITIVE);
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/TestFormulaParser.java b/src/ooxml/testcases/org/apache/poi/ss/tests/formula/TestFormulaParser.java
index 42a8e47d60..5d1c7d8e31 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/TestFormulaParser.java
+++ b/src/ooxml/testcases/org/apache/poi/ss/tests/formula/TestFormulaParser.java
@@ -46,7 +46,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author David North
  */
-public class TestFormulaParser {
+class TestFormulaParser {
 
     @Test
     void testHSSFFailsForOver65536() {
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/TestStructuredReferences.java b/src/ooxml/testcases/org/apache/poi/ss/tests/formula/TestStructuredReferences.java
index 9e7930737b..f169e7b69d 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/TestStructuredReferences.java
+++ b/src/ooxml/testcases/org/apache/poi/ss/tests/formula/TestStructuredReferences.java
@@ -42,7 +42,7 @@ import org.junit.jupiter.api.Test;
  *         Excel Structured Reference Syntax
  *      </a>
  */
-public class TestStructuredReferences {
+class TestStructuredReferences {
 
     /**
      * Test the regular expression used in INDIRECT() evaluation to recognize structured references
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestSumifsXSSF.java b/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestSumifsXSSF.java
index 98d8c479f2..2beafffd13 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestSumifsXSSF.java
+++ b/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestSumifsXSSF.java
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
 /**
  *
  */
-public class TestSumifsXSSF {
+class TestSumifsXSSF {
 
     /**
      * handle null cell predicate
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestVlookup.java b/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestVlookup.java
index ce6ba5f793..3c689093e6 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestVlookup.java
+++ b/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestVlookup.java
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Test the VLOOKUP function
  */
-public class TestVlookup {
+class TestVlookup {
 
     @Test
     void testFullColumnAreaRef61841() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java b/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java
index 944052b53a..001ea8ebce 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java
+++ b/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java
@@ -65,7 +65,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-public class TestEmbedOLEPackage {
+class TestEmbedOLEPackage {
     private static byte[] samplePPT, samplePPTX, samplePNG;
 
     private static final POIDataSamples ssamples = POIDataSamples.getSpreadSheetInstance();
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java b/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java
index 777fb1a5ec..3ee318abdf 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java
+++ b/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class TestXSSFRangeCopier extends BaseTestRangeCopier {
+class TestXSSFRangeCopier extends BaseTestRangeCopier {
     public TestXSSFRangeCopier() {
         super();
         workbook = new XSSFWorkbook();
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestSXSSFCellUtil.java b/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestSXSSFCellUtil.java
index 33406376b5..0e2511f36d 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestSXSSFCellUtil.java
+++ b/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestSXSSFCellUtil.java
@@ -20,7 +20,7 @@ package org.apache.poi.ss.tests.util;
 import org.apache.poi.ss.util.BaseTestCellUtil;
 import org.apache.poi.xssf.SXSSFITestDataProvider;
 
-public class TestSXSSFCellUtil extends BaseTestCellUtil {
+class TestSXSSFCellUtil extends BaseTestCellUtil {
     public TestSXSSFCellUtil() {
         super(SXSSFITestDataProvider.instance);
     }
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java b/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java
index 50fc0cfde5..40f16dbe61 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java
+++ b/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java
@@ -20,7 +20,7 @@ package org.apache.poi.ss.tests.util;
 import org.apache.poi.ss.util.BaseTestCellUtil;
 import org.apache.poi.xssf.XSSFITestDataProvider;
 
-public class TestXSSFCellUtil extends BaseTestCellUtil {
+class TestXSSFCellUtil extends BaseTestCellUtil {
     public TestXSSFCellUtil() {
         super(XSSFITestDataProvider.instance);
     }
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java b/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java
index 5cd9066479..c6f9f59cc0 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java
+++ b/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java
@@ -35,7 +35,7 @@ import org.apache.poi.ss.util.PropertyTemplate;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.junit.jupiter.api.Test;
 
-public class TestXSSFPropertyTemplate {
+class TestXSSFPropertyTemplate {
 
     @Test
     void applyBorders() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/util/tests/TestIdentifierManager.java b/src/ooxml/testcases/org/apache/poi/util/tests/TestIdentifierManager.java
index 4ec87d9362..71fe575c67 100644
--- a/src/ooxml/testcases/org/apache/poi/util/tests/TestIdentifierManager.java
+++ b/src/ooxml/testcases/org/apache/poi/util/tests/TestIdentifierManager.java
@@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.apache.poi.ooxml.util.IdentifierManager;
 import org.junit.jupiter.api.Test;
 
-public class TestIdentifierManager {
+class TestIdentifierManager {
     @Test
     void testBasic()
     {
diff --git a/src/ooxml/testcases/org/apache/poi/util/tests/TestTempFileThreaded.java b/src/ooxml/testcases/org/apache/poi/util/tests/TestTempFileThreaded.java
index 1cd2009a56..678280e7b1 100644
--- a/src/ooxml/testcases/org/apache/poi/util/tests/TestTempFileThreaded.java
+++ b/src/ooxml/testcases/org/apache/poi/util/tests/TestTempFileThreaded.java
@@ -40,7 +40,7 @@ import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class TestTempFileThreaded {
+class TestTempFileThreaded {
     private static final int NUMBER_OF_THREADS = 10;
     private static final int NUMBER_OF_TESTS = 200;
 
diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java
index 700785ab1e..c0f893eb4b 100644
--- a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java
+++ b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java
@@ -29,7 +29,7 @@ import org.openxmlformats.schemas.drawingml.x2006.chart.*;
 import org.openxmlformats.schemas.drawingml.x2006.main.*;
 
 // aim is to get these classes loaded and included in poi-ooxml-lite.jar
-public class TestNecessaryOOXMLClasses {
+class TestNecessaryOOXMLClasses {
 
     @Test
     void testProblemClasses() {
diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestXDDFColor.java b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestXDDFColor.java
index cf8145ec46..7eb01c29a7 100644
--- a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestXDDFColor.java
+++ b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestXDDFColor.java
@@ -37,7 +37,7 @@ import org.xmlunit.builder.DiffBuilder;
 import org.xmlunit.builder.Input;
 import org.xmlunit.diff.Diff;
 
-public class TestXDDFColor {
+class TestXDDFColor {
     private static final String XMLNS = "xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\"/>";
 
     @Test
diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java
index efb5ad7e39..4ace282749 100644
--- a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java
+++ b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java
@@ -26,7 +26,7 @@ import org.apache.poi.ooxml.POIXMLRelation;
 import org.junit.jupiter.api.Test;
 import org.openxmlformats.schemas.drawingml.x2006.chart.CTChartSpace;
 
-public class TestXDDFChart {
+class TestXDDFChart {
     @Test
     void testConstruct() {
         // minimal test to cause ooxml-lite to include all the classes in poi-ooxml-lite
diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java
index 6bfba94e6d..f4bd59ec9a 100644
--- a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java
+++ b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java
@@ -21,7 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.junit.jupiter.api.Test;
 
-public class TestXDDFChartExtensionList {
+class TestXDDFChartExtensionList {
 
     @Test
     void getXmlObject() {
diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java
index e49d7622cb..6f49a18dca 100644
--- a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java
+++ b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Test case for bug 63153
  */
-public class TestXDDFChartRemoveSeries {
+class TestXDDFChartRemoveSeries {
     final File resultDir = new File("build/custom-reports-test");
     String procName = null;
     String fileName = null;
diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java
index b512d1dd1d..0cbb10b0f2 100644
--- a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java
+++ b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Tests for {@link XDDFDataSourcesFactory}.
  */
-public class TestXDDFDataSourcesFactory {
+class TestXDDFDataSourcesFactory {
 
     private static final Object[][] numericCells = {
             {0.0,      1.0,       2.0,     3.0,      4.0},
diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java
index cf9cdd00b8..1d98b42e44 100644
--- a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java
+++ b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java
@@ -26,7 +26,7 @@ import org.apache.poi.util.Units;
 import org.junit.jupiter.api.Test;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTTextBodyProperties;
 
-public class TestXDDFTextBodyProperties {
+class TestXDDFTextBodyProperties {
 
     @Test
     void testProperties() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java
index 80314f1f17..90c7759e6b 100644
--- a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java
+++ b/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java
@@ -40,7 +40,7 @@ import org.apache.poi.xssf.usermodel.XSSFTextBox;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.junit.jupiter.api.Test;
 
-public class TestXDDFTextRun {
+class TestXDDFTextRun {
 
     @Test
     void testTextRunPropertiesInSlide() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java b/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java
index 9048750dd2..adc76e554a 100644
--- a/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java
+++ b/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class TestXDGFVisioExtractor {
+class TestXDGFVisioExtractor {
 
     private static final POIDataSamples SAMPLES = POIDataSamples.getDiagramInstance();
     private OPCPackage pkg;
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java b/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java
index 7dc7ed7876..307348f011 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java
@@ -27,7 +27,7 @@ import org.apache.xmlbeans.XmlObject;
 import org.junit.jupiter.api.Test;
 
 // aim is to get these classes loaded and included in poi-ooxml-lite.jar
-public class TestNecessaryOOXMLClasses {
+class TestNecessaryOOXMLClasses {
 
     @Test
     void testProblemClasses() {
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java b/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java
index 0f27f9d56c..d4d44a836b 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java
@@ -112,7 +112,7 @@ import org.junit.jupiter.api.function.ThrowingSupplier;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTOuterShadowEffect;
 import org.openxmlformats.schemas.presentationml.x2006.main.CTShape;
 
-public class TestXSLFBugs {
+class TestXSLFBugs {
     private static final POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
 
     private static boolean xslfOnly;
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java b/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java
index c15e5b7be9..1d948dc6ee 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java
@@ -42,7 +42,7 @@ import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideMasterIdListE
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestXSLFSlideShow {
+class TestXSLFSlideShow {
     private static final POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
     private OPCPackage pack;
 
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java b/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
index 08fb36ac84..5e5f0ed4cb 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
@@ -39,7 +39,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Tests for XSLFPowerPointExtractor
  */
-public class TestXSLFPowerPointExtractor {
+class TestXSLFPowerPointExtractor {
     private static final POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
 
 	/**
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java
index b383faac23..4226b28095 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java
@@ -41,7 +41,7 @@ import org.junit.jupiter.params.provider.MethodSource;
  * Test class for testing PPTX2PNG utility which renders .ppt and .pptx slideshows
  */
 @SuppressWarnings("ConstantConditions")
-public class TestPPTX2PNG {
+class TestPPTX2PNG {
     private static boolean xslfOnly;
     private static final POIDataSamples samples = POIDataSamples.getSlideShowInstance();
     private static final File basedir = null;
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java
index 6f6543d021..520f62fb04 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java
@@ -37,7 +37,7 @@ import org.openxmlformats.schemas.presentationml.x2006.main.CTNotesMasterIdListE
 import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideIdListEntry;
 import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideMasterIdListEntry;
 
-public class TestXMLSlideShow extends BaseTestSlideShow<XSLFShape, XSLFTextParagraph> {
+class TestXMLSlideShow extends BaseTestSlideShow<XSLFShape, XSLFTextParagraph> {
     private OPCPackage pack;
 
     @Override
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
index 784f24dce1..330f6629e7 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
@@ -36,7 +36,7 @@ import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharacterProperties
 import org.openxmlformats.schemas.drawingml.x2006.main.STTextStrikeType;
 import org.openxmlformats.schemas.drawingml.x2006.main.STTextUnderlineType;
 
-public class TestXSLFAutoShape {
+class TestXSLFAutoShape {
     @Test
     void testTextBodyProperies() throws IOException {
         XMLSlideShow ppt = new XMLSlideShow();
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFBackground.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFBackground.java
index f2a48f6079..907a37a80d 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFBackground.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFBackground.java
@@ -26,7 +26,7 @@ import java.io.IOException;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestXSLFBackground {
+class TestXSLFBackground {
     @Test
     void testNoFillBackground() throws IOException {
         XMLSlideShow pptx = new XMLSlideShow();
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java
index 000ab86438..c9608359bb 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java
@@ -61,7 +61,7 @@ import org.junit.jupiter.api.Test;
 /**
  * a modified version from POI-examples
  */
-public class TestXSLFChart {
+class TestXSLFChart {
     @Test
     void testFillPieChartTemplate() throws IOException {
         XMLSlideShow pptx = XSLFTestDataSamples.openSampleDocument("pie-chart.pptx");
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java
index b73cbc11ec..a872ecca1b 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java
@@ -32,7 +32,7 @@ import org.openxmlformats.schemas.drawingml.x2006.main.STPresetColorVal;
 import org.openxmlformats.schemas.drawingml.x2006.main.STSchemeColorVal;
 import org.openxmlformats.schemas.drawingml.x2006.main.STSystemColorVal;
 
-public class TestXSLFColor {
+class TestXSLFColor {
 
     @Test
     void testGetters() {
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java
index 5b6d5eee9e..d7afa7ef0b 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java
@@ -38,7 +38,7 @@ import org.openxmlformats.schemas.drawingml.x2006.main.STLineEndWidth;
 import org.openxmlformats.schemas.drawingml.x2006.main.STShapeType;
 import org.openxmlformats.schemas.presentationml.x2006.main.CTConnector;
 
-public class TestXSLFConnectorShape {
+class TestXSLFConnectorShape {
 
     @Test
     void testLineDecorations() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFExamples.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFExamples.java
index 04ecad53ce..02640c0efe 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFExamples.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFExamples.java
@@ -55,7 +55,7 @@ import org.openxmlformats.schemas.presentationml.x2006.main.STTLTimeNodeType;
  * Reimplement and test examples classes so the necessary XmlBeans schema objects are included
  * in the lite schema
  */
-public class TestXSLFExamples {
+class TestXSLFExamples {
     @Test
     void LinkVideoToPptx() throws IOException, URISyntaxException {
         String videoFileName = "file_example_MP4_640_3MG.mp4";
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java
index 3972041508..6f57d11790 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java
@@ -36,7 +36,7 @@ import java.io.IOException;
 import static org.apache.poi.xslf.usermodel.TestXSLFSimpleShape.getSpPr;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestXSLFFreeformShape {
+class TestXSLFFreeformShape {
 
     @Test
     void testSetPath() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java
index ae0be875d6..547da5f71c 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java
@@ -26,7 +26,7 @@ import java.awt.geom.Rectangle2D;
 import org.apache.poi.xslf.XSLFTestDataSamples;
 import org.junit.jupiter.api.Test;
 
-public class TestXSLFGroupShape {
+class TestXSLFGroupShape {
 
     @Test
     void testCreateShapes() throws Exception {
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java
index 4162690a71..90fcf71568 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java
@@ -30,7 +30,7 @@ import org.apache.poi.openxml4j.opc.TargetMode;
 import org.apache.poi.xslf.XSLFTestDataSamples;
 import org.junit.jupiter.api.Test;
 
-public class TestXSLFHyperlink {
+class TestXSLFHyperlink {
 
     @Test
     void testRead() throws IOException{
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFNotes.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFNotes.java
index dec1101951..9b5efa3cf2 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFNotes.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFNotes.java
@@ -26,7 +26,7 @@ import org.apache.poi.sl.usermodel.Placeholder;
 import org.apache.poi.xslf.XSLFTestDataSamples;
 import org.junit.jupiter.api.Test;
 
-public class TestXSLFNotes {
+class TestXSLFNotes {
 
     @Test
     void createNewNote() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
index 4d0c05b1b6..b4bd226083 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
@@ -45,7 +45,7 @@ import org.apache.poi.xslf.util.PPTX2PNG;
 import org.junit.jupiter.api.Test;
 import org.openxmlformats.schemas.presentationml.x2006.main.CTPicture;
 
-public class TestXSLFPictureShape {
+class TestXSLFPictureShape {
     private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
 
     @Test
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java
index a426640c74..116eddac13 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java
@@ -27,7 +27,7 @@ import org.apache.poi.xslf.XSLFTestDataSamples;
 import org.junit.jupiter.api.Test;
 import org.openxmlformats.schemas.drawingml.x2006.main.STTextUnderlineType;
 
-public class TestXSLFShape {
+class TestXSLFShape {
 
     @Test
     void testReadTextShapes() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java
index a7b2f494d5..2f5b57161f 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
 /**
  * test common operations on containers of shapes (sheets and groups of shapes)
  */
-public class TestXSLFShapeContainer {
+class TestXSLFShapeContainer {
 
     void verifyContainer(XSLFShapeContainer container) {
         container.clear();
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java
index f7526f1bb0..cd467554e3 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Yegor Kozlov
  */
-public class TestXSLFSheet {
+class TestXSLFSheet {
 
     @Test
     void testCreateShapes() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java
index 4b2f777abe..c25e822538 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java
@@ -47,7 +47,7 @@ import org.openxmlformats.schemas.drawingml.x2006.main.STLineCap;
 import org.openxmlformats.schemas.drawingml.x2006.main.STPresetLineDashVal;
 import org.openxmlformats.schemas.drawingml.x2006.main.STShapeType;
 
-public class TestXSLFSimpleShape {
+class TestXSLFSimpleShape {
 
     @Test
     void testLineStyles() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java
index 08e5ae9262..3b83355369 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java
@@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test;
 /**
  * @author Yegor Kozlov
  */
-public class TestXSLFSlide {
+class TestXSLFSlide {
 
     @Test
     void testReadShapes() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java
index 9e6d00e2af..7e47a24b0a 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
 /**
  * @author Yegor Kozlov
  */
-public class TestXSLFSlideShow {
+class TestXSLFSlideShow {
     @Test
     void testCreateSlide() throws IOException {
         XMLSlideShow  ppt = new XMLSlideShow();
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java
index a9c7e2220a..cbbe738406 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java
@@ -47,7 +47,7 @@ import org.junit.jupiter.api.Test;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTTableCell;
 import org.openxmlformats.schemas.presentationml.x2006.main.CTGraphicalObjectFrame;
 
-public class TestXSLFTable {
+class TestXSLFTable {
 
     @Test
     void testResize() throws Exception {
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java
index 3e9b817052..4c1109e519 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTTableCell;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTTableRow;
 
-public class TestXSLFTableRow {
+class TestXSLFTableRow {
 
     private static XMLSlideShow ppt;
     private static XSLFTable tbl;
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java
index eda61ee6d2..f1232de7cd 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java
@@ -23,7 +23,7 @@ import java.io.IOException;
 
 import org.junit.jupiter.api.Test;
 
-public class TestXSLFTableStyles {
+class TestXSLFTableStyles {
 
     @Test
     void testRead() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java
index 44969a3026..04fa9551d1 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java
@@ -28,7 +28,7 @@ import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharacterProperties
 /**
  * @author Yegor Kozlov
  */
-public class TestXSLFTextBox {
+class TestXSLFTextBox {
 
     @Test
     void testPlaceholder() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
index d6d200871c..d848ed8e65 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
@@ -41,7 +41,7 @@ import org.junit.jupiter.api.Test;
 /**
  * @author Yegor Kozlov
  */
-public class TestXSLFTextParagraph {
+class TestXSLFTextParagraph {
     // private static POILogger _logger = POILogFactory.getLogger(XSLFTextParagraph.class);
 
     static class DrawTextParagraphProxy extends DrawTextParagraph {
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java
index ae4ab6ceb1..783e8abe4d 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java
@@ -39,7 +39,7 @@ import org.openxmlformats.schemas.presentationml.x2006.main.CTShape;
 /**
  * @author Yegor Kozlov
  */
-public class TestXSLFTextRun {
+class TestXSLFTextRun {
 
     @Test
     void testRunProperties() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java
index 6d455e7484..372e0216f4 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java
@@ -52,7 +52,7 @@ import org.openxmlformats.schemas.drawingml.x2006.main.STTextAlignType;
 import org.openxmlformats.schemas.presentationml.x2006.main.CTPlaceholder;
 import org.openxmlformats.schemas.presentationml.x2006.main.STPlaceholderType;
 
-public class TestXSLFTextShape {
+class TestXSLFTextShape {
     private static boolean xslfOnly;
 
     @BeforeAll
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java
index 2fbeceb0ba..54f66f6b8b 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Yegor Kozlov
  */
-public class TestXSLFTheme {
+class TestXSLFTheme {
     @Test
     void testRead(){
         XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("themes.pptx");
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java b/src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java
index f27bdf856c..3f8d094b0f 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java
@@ -24,7 +24,7 @@ import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRow;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSheetData;
 
 // aim is to get these classes loaded and included in poi-ooxml-lite.jar
-public class TestNecessaryOOXMLClasses {
+class TestNecessaryOOXMLClasses {
 
     @Test
     void testProblemClasses() {
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestSheetProtection.java b/src/ooxml/testcases/org/apache/poi/xssf/TestSheetProtection.java
index b5b1f46a1c..f3459af7dc 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/TestSheetProtection.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/TestSheetProtection.java
@@ -27,7 +27,7 @@ import java.io.IOException;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class TestSheetProtection {
+class TestSheetProtection {
 	private XSSFWorkbook workbook;
 	private XSSFSheet sheet;
 
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java b/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java
index c14adb5039..11c4ff20d7 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java
@@ -44,7 +44,7 @@ import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.junit.jupiter.api.Test;
 
-public class TestWorkbookProtection {
+class TestWorkbookProtection {
 
     @Test
     void workbookAndRevisionPassword() throws Exception {
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFCloneSheet.java b/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFCloneSheet.java
index d0acc36e69..2858429389 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFCloneSheet.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFCloneSheet.java
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
-public class TestXSSFCloneSheet  extends BaseTestCloneSheet {
+class TestXSSFCloneSheet  extends BaseTestCloneSheet {
     public TestXSSFCloneSheet() {
         super(HSSFITestDataProvider.instance);
     }
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFOffset.java b/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFOffset.java
index a8dc775152..b39c33bce0 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFOffset.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFOffset.java
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestXSSFOffset {
+class TestXSSFOffset {
 
     @Test
     void testOffsetWithEmpty23Arguments() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSharedStringsTable.java b/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSharedStringsTable.java
index 71d31d12c0..7a56829584 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSharedStringsTable.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSharedStringsTable.java
@@ -27,7 +27,7 @@ import org.apache.poi.openxml4j.opc.OPCPackage;
 import org.apache.poi.openxml4j.opc.PackagePart;
 import org.junit.jupiter.api.Test;
 
-public class TestXSSFBSharedStringsTable {
+class TestXSSFBSharedStringsTable {
     private static POIDataSamples _ssTests = POIDataSamples.getSpreadSheetInstance();
 
     @Test
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSheetHyperlinkManager.java b/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSheetHyperlinkManager.java
index 3e9d8a1734..6fd654df31 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSheetHyperlinkManager.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSheetHyperlinkManager.java
@@ -29,7 +29,7 @@ import org.apache.poi.xssf.eventusermodel.XSSFBReader;
 import org.apache.poi.xssf.eventusermodel.XSSFReader;
 import org.junit.jupiter.api.Test;
 
-public class TestXSSFBSheetHyperlinkManager {
+class TestXSSFBSheetHyperlinkManager {
     private static POIDataSamples _ssTests = POIDataSamples.getSpreadSheetInstance();
 
     @Test
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java b/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java
index 1779a62097..2d6e57e049 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java
@@ -34,7 +34,7 @@ import org.apache.poi.xssf.binary.XSSFBStylesTable;
 import org.apache.poi.xssf.usermodel.XSSFComment;
 import org.junit.jupiter.api.Test;
 
-public class TestXSSFBReader {
+class TestXSSFBReader {
 
     private static POIDataSamples _ssTests = POIDataSamples.getSpreadSheetInstance();
 
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java b/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java
index 82cf53cb39..8cd773a2e9 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java
@@ -33,7 +33,7 @@ import java.nio.file.Files;
 /**
  * Tests for {@link XSSFBEventBasedExcelExtractor}
  */
-public class TestXSSFBEventBasedExcelExtractor {
+class TestXSSFBEventBasedExcelExtractor {
     protected XSSFEventBasedExcelExtractor getExtractor(String sampleName) throws Exception {
         return new XSSFBEventBasedExcelExtractor(XSSFTestDataSamples.
                 openSamplePackage(sampleName));
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java b/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java
index dd206dba1b..0de3611bc1 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java
@@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Tests for {@link XSSFEventBasedExcelExtractor}
  */
-public class TestXSSFEventBasedExcelExtractor {
+class TestXSSFEventBasedExcelExtractor {
 	protected XSSFEventBasedExcelExtractor getExtractor(String sampleName) throws Exception {
         return new XSSFEventBasedExcelExtractor(XSSFTestDataSamples.
                 openSamplePackage(sampleName));
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java b/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java
index 789026819e..3dd4b83039 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java
@@ -21,7 +21,7 @@ import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.junit.jupiter.api.AfterEach;
 
 
-public class TestXSSFEventBasedExcelExtractorUsingFactory extends TestXSSFEventBasedExcelExtractor {
+class TestXSSFEventBasedExcelExtractorUsingFactory extends TestXSSFEventBasedExcelExtractor {
 	@Override
 	protected final XSSFEventBasedExcelExtractor getExtractor(String sampleName) throws Exception {
 		ExtractorFactory.setAllThreadsPreferEventExtractors(true);
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java b/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java
index 1b66a2fbe4..2068a4a993 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java
@@ -40,7 +40,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Tests for {@link XSSFExcelExtractor}
  */
-public class TestXSSFExcelExtractor {
+class TestXSSFExcelExtractor {
 	protected XSSFExcelExtractor getExtractor(String sampleName) {
 		return new XSSFExcelExtractor(XSSFTestDataSamples.openSampleWorkbook(sampleName));
 	}
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java b/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
index 0ae7c5dc7d..7e526810e8 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
@@ -42,7 +42,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.xml.sax.SAXException;
 
-public class TestXSSFImportFromXML {
+class TestXSSFImportFromXML {
 
     @Test
     void testImportFromXML() throws IOException, XPathExpressionException, SAXException{
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java b/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
index be192b3f03..3d74eba030 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
@@ -32,7 +32,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.junit.jupiter.api.Test;
 
 
-public class TestLoadSaveXSSF {
+class TestLoadSaveXSSF {
     private static final POIDataSamples _ssSamples = POIDataSamples.getSpreadSheetInstance();
 
     @Test
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java b/src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java
index a37ac1feb2..a02da05778 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java
@@ -47,7 +47,7 @@ import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTComments;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRst;
 
 
-public class TestCommentsTable {
+class TestCommentsTable {
 
     private static final String TEST_A2_TEXT = "test A2 text";
     private static final String TEST_A1_TEXT = "test A1 text";
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java b/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java
index 80b99ed4bd..b50d691185 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java
@@ -44,7 +44,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.junit.jupiter.api.Test;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColor;
 
-public class TestThemesTable {
+class TestThemesTable {
     private static final String testFileComplex = "Themes2.xlsx";
     // TODO .xls version available too, add HSSF support then check
 
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
index 27b7e1dfa2..6d977db3da 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
@@ -46,7 +46,7 @@ import org.junit.jupiter.api.Test;
  *
  * see Bug #57450 which reported the original misbehaviour
  */
-public class TestAutoSizeColumnTracker {
+class TestAutoSizeColumnTracker {
 
     private SXSSFSheet sheet;
     private SXSSFWorkbook workbook;
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java
index a40fdc17ed..a1377a3b5d 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java
@@ -52,7 +52,7 @@ import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRst;
  * Tests various functionality having to do with {@link SXSSFCell}.  For instance support for
  * particular datatypes, etc.
  */
-public class TestSXSSFCell extends BaseTestXCell {
+class TestSXSSFCell extends BaseTestXCell {
 
     public TestSXSSFCell() {
         super(SXSSFITestDataProvider.instance);
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFDataValidation.java b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFDataValidation.java
index a3dfdfae8f..a344cb115f 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFDataValidation.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFDataValidation.java
@@ -29,7 +29,7 @@ import org.apache.poi.ss.util.CellRangeAddressList;
 import org.apache.poi.xssf.SXSSFITestDataProvider;
 import org.junit.jupiter.api.Test;
 
-public class TestSXSSFDataValidation extends BaseTestDataValidation {
+class TestSXSSFDataValidation extends BaseTestDataValidation {
 
     public TestSXSSFDataValidation(){
         super(SXSSFITestDataProvider.instance);
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFEvaluationSheet.java b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFEvaluationSheet.java
index b40e279fb1..3600479f31 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFEvaluationSheet.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFEvaluationSheet.java
@@ -28,7 +28,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-public class TestSXSSFEvaluationSheet extends BaseTestXEvaluationSheet {
+class TestSXSSFEvaluationSheet extends BaseTestXEvaluationSheet {
     private List<Workbook> workbooksToClose = new ArrayList<>();
 
     @AfterEach
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java
index 41173c7e1c..a29d0166e3 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java
@@ -31,7 +31,7 @@ import org.apache.poi.xssf.usermodel.XSSFHyperlink;
  *
  * @author Yegor Kozlov
  */
-public class TestSXSSFHyperlink extends BaseTestHyperlink {
+class TestSXSSFHyperlink extends BaseTestHyperlink {
 
     public TestSXSSFHyperlink() {
         super(SXSSFITestDataProvider.instance);
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java
index 485518ab57..cfb520e508 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java
@@ -50,7 +50,7 @@ import org.junit.jupiter.params.provider.MethodSource;
  *
  * see Bug #57450 which reported the original misbehaviour
  */
-public class TestSXSSFSheetAutoSizeColumn {
+class TestSXSSFSheetAutoSizeColumn {
 
     private static final String SHORT_CELL_VALUE = "Ben";
     private static final String LONG_CELL_VALUE = "B Be Ben Beni Benif Benify Benif Beni Ben Be B";
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java
index 7d50ad410d..aba3a2f376 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java
@@ -31,7 +31,7 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-public class TestSXSSFUnicodeSurrogates {
+class TestSXSSFUnicodeSurrogates {
 
     // "𝝊𝝋𝝌𝝍𝝎𝝏𝝐𝝑𝝒𝝓𝝔𝝕𝝖𝝗𝝘𝝙𝝚𝝛𝝜𝝝𝝞𝝟𝝠𝝡𝝢𝝣𝝤𝝥𝝦𝝧𝝨𝝩𝝪𝝫𝝬𝝭𝝮𝝯𝝰𝝱𝝲𝝳𝝴𝝵𝝶𝝷𝝸𝝹𝝺";
     private static final String unicodeText =
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestTableStyles.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestTableStyles.java
index 1149d13014..e83cb1cd83 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestTableStyles.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestTableStyles.java
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Test built-in table styles
  */
-public class TestTableStyles {
+class TestTableStyles {
 
     /**
      * Test that a built-in style is initialized properly
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
index e72c3d2505..cefac9bb24 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
@@ -59,7 +59,7 @@ import org.openxmlformats.schemas.spreadsheetml.x2006.main.STHorizontalAlignment
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.STPatternType;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.STVerticalAlignment;
 
-public class TestXSSFCellStyle {
+class TestXSSFCellStyle {
 	private StylesTable stylesTable;
     private XSSFCellStyle cellStyle;
 
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
index de61983508..47babc0925 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
@@ -41,7 +41,7 @@ import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCols;
  * </em>
  *
  */
-public class TestXSSFColGrouping {
+class TestXSSFColGrouping {
 
 	private static final POILogger logger = POILogFactory.getLogger(TestXSSFColGrouping.class);
 
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
index 308b14b270..320aacf44c 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
@@ -40,7 +40,7 @@ import org.junit.jupiter.api.Test;
 /**
  * XSSF-specific Conditional Formatting tests
  */
-public class TestXSSFConditionalFormatting extends BaseTestConditionalFormatting {
+class TestXSSFConditionalFormatting extends BaseTestConditionalFormatting {
 
     public TestXSSFConditionalFormatting(){
         super(XSSFITestDataProvider.instance);
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
index d7ef99714b..18f4d51d5d 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
@@ -42,7 +42,7 @@ import org.apache.poi.xssf.XSSFITestDataProvider;
 import org.apache.poi.xssf.XSSFTestDataSamples;
 import org.junit.jupiter.api.Test;
 
-public class TestXSSFDataValidation extends BaseTestDataValidation {
+class TestXSSFDataValidation extends BaseTestDataValidation {
 
     public TestXSSFDataValidation(){
         super(XSSFITestDataProvider.instance);
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java
index e71525efb6..79d340ebe2 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
 import java.io.IOException;
 import java.util.stream.IntStream;
 
-public class TestXSSFDataValidationConstraint {
+class TestXSSFDataValidationConstraint {
     static final int listType = ValidationType.LIST;
     static final int ignoredType = OperatorType.IGNORED;
 
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java
index acaa97c62f..f85f0411ed 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDialogsheet;
 
 
-public class TestXSSFDialogSheet {
+class TestXSSFDialogSheet {
 
     @Test
 	void testCreateDialogSheet() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
index f788967454..6680e56be4 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
@@ -39,7 +39,7 @@ import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestXSSFDrawing {
+class TestXSSFDrawing {
     @Test
     void bug54803() throws Exception {
         try (XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("bug54803.xlsx")) {
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvaluationSheet.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvaluationSheet.java
index 32a883b356..431f585b60 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvaluationSheet.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvaluationSheet.java
@@ -28,7 +28,7 @@ import org.apache.poi.ss.usermodel.BaseTestXEvaluationSheet;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.junit.jupiter.api.Test;
 
-public class TestXSSFEvaluationSheet extends BaseTestXEvaluationSheet {
+class TestXSSFEvaluationSheet extends BaseTestXEvaluationSheet {
 
     @Test
     void test() throws Exception {
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvenFooter.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvenFooter.java
index 7dc0f28c7a..7c119fa851 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvenFooter.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvenFooter.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class TestXSSFEvenFooter {
+class TestXSSFEvenFooter {
 
     private XSSFWorkbook wb;
     private XSSFSheet sheet;
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvenHeader.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvenHeader.java
index 664d9c3743..d717a699ea 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvenHeader.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvenHeader.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class TestXSSFEvenHeader {
+class TestXSSFEvenHeader {
 
     private XSSFWorkbook wb;
     private XSSFSheet sheet;
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFirstFooter.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFirstFooter.java
index 7fc02e0830..1914f49d54 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFirstFooter.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFirstFooter.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class TestXSSFFirstFooter {
+class TestXSSFFirstFooter {
 
     private XSSFWorkbook wb;
     private XSSFSheet sheet;
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFirstHeader.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFirstHeader.java
index e6a60bb522..8a67d6aa3b 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFirstHeader.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFirstHeader.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class TestXSSFFirstHeader {
+class TestXSSFFirstHeader {
 
     private XSSFWorkbook wb;
     private XSSFSheet sheet;
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFForkedEvaluator.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFForkedEvaluator.java
index ca9ba631f9..9a391019f5 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFForkedEvaluator.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFForkedEvaluator.java
@@ -20,7 +20,7 @@ package org.apache.poi.xssf.usermodel;
 import org.apache.poi.ss.formula.eval.forked.BaseTestForkedEvaluator;
 import org.apache.poi.ss.usermodel.Workbook;
 
-public class TestXSSFForkedEvaluator extends BaseTestForkedEvaluator {
+class TestXSSFForkedEvaluator extends BaseTestForkedEvaluator {
 
     @Override
     protected Workbook newWorkbook() {
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooterProperties.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooterProperties.java
index 5e2c37e6d9..654bf75b31 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooterProperties.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooterProperties.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class TestXSSFHeaderFooterProperties {
+class TestXSSFHeaderFooterProperties {
 
     private XSSFWorkbook wb;
     private XSSFSheet sheet;
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFOddFooter.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFOddFooter.java
index 20fd941f13..4113de6225 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFOddFooter.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFOddFooter.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class TestXSSFOddFooter {
+class TestXSSFOddFooter {
 
     private XSSFWorkbook wb;
     private XSSFSheet sheet;
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFOddHeader.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFOddHeader.java
index 6bd9f1c0a2..4f88009127 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFOddHeader.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFOddHeader.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class TestXSSFOddHeader {
+class TestXSSFOddHeader {
 
     private XSSFWorkbook wb;
     private XSSFSheet sheet;
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableName.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableName.java
index 6ff5d2902a..fc001229ce 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableName.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableName.java
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.BeforeEach;
 /**
  * Test pivot tables created by named range
  */
-public class TestXSSFPivotTableName extends BaseTestXSSFPivotTable {
+class TestXSSFPivotTableName extends BaseTestXSSFPivotTable {
 
     @Override
     @BeforeEach
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableRef.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableRef.java
index 9f64e0e4e1..29ddf4b7ea 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableRef.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableRef.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.BeforeEach;
 /**
  * Test pivot tables created by area reference
  */
-public class TestXSSFPivotTableRef extends BaseTestXSSFPivotTable {
+class TestXSSFPivotTableRef extends BaseTestXSSFPivotTable {
 
     @Override
     @BeforeEach
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java
index 9fcc6a0bc3..446a597253 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java
@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 /**
  * Tests for {@link XSSFPrintSetup}
  */
-public class TestXSSFPrintSetup {
+class TestXSSFPrintSetup {
     @Test
     void testSetGetPaperSize() {
         CTWorksheet worksheet = CTWorksheet.Factory.newInstance();
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java
index fbe9541a8e..983f36cd8c 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java
@@ -27,7 +27,7 @@ import org.apache.poi.util.POILogger;
 import org.apache.poi.xssf.XSSFTestDataSamples;
 import org.junit.jupiter.api.Test;
 
-public class TestXSSFSheetMergeRegions {
+class TestXSSFSheetMergeRegions {
 
     private static final POILogger LOG = POILogFactory.getLogger(TestXSSFSheetMergeRegions.class);
 
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftColumns.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftColumns.java
index 45bb31e3a3..92d5735ec5 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftColumns.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftColumns.java
@@ -25,7 +25,7 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.XSSFITestDataProvider;
 import org.apache.poi.xssf.XSSFTestDataSamples;
 
-public class TestXSSFSheetShiftColumns extends BaseTestSheetShiftColumns {
+class TestXSSFSheetShiftColumns extends BaseTestSheetShiftColumns {
     public TestXSSFSheetShiftColumns() {
         super(); 
         workbook = new XSSFWorkbook();
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRowsAndColumns.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRowsAndColumns.java
index da26971cdb..e31332027a 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRowsAndColumns.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRowsAndColumns.java
@@ -34,7 +34,7 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCell;
 
-public class TestXSSFSheetShiftRowsAndColumns {
+class TestXSSFSheetShiftRowsAndColumns {
     private static final File resultDir = new File("build/custom-reports-test");
 
     private static final int numRows = 4;
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSimpleShape.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSimpleShape.java
index f10879a2df..db0bb77233 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSimpleShape.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSimpleShape.java
@@ -35,7 +35,7 @@ import org.apache.poi.xddf.usermodel.text.XDDFTextBody;
 import org.apache.poi.xddf.usermodel.text.XDDFTextParagraph;
 import org.junit.jupiter.api.Test;
 
-public class TestXSSFSimpleShape {
+class TestXSSFSimpleShape {
     @Test
     void testXSSFTextParagraph() throws IOException {
         try (XSSFWorkbook wb = new XSSFWorkbook()) {
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextParagraph.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextParagraph.java
index 503c0ce7e1..ec13f604be 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextParagraph.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextParagraph.java
@@ -24,7 +24,7 @@ import java.util.List;
 
 import org.junit.jupiter.api.Test;
 
-public class TestXSSFTextParagraph {
+class TestXSSFTextParagraph {
     @Test
     void testXSSFTextParagraph() throws IOException {
         try (XSSFWorkbook wb = new XSSFWorkbook()) {
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java
index 77ab6a7a57..74434b164b 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java
@@ -24,7 +24,7 @@ import java.util.List;
 
 import org.junit.jupiter.api.Test;
 
-public class TestXSSFTextRun {
+class TestXSSFTextRun {
     @Test
     void testXSSFTextParagraph() throws IOException {
         try (XSSFWorkbook wb = new XSSFWorkbook()) {
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java
index f5b27bfb40..506e0dead8 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java
@@ -30,7 +30,7 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-public class TestXSSFUnicodeSurrogates {
+class TestXSSFUnicodeSurrogates {
 
     // "𝝊𝝋𝝌𝝍𝝎𝝏𝝐𝝑𝝒𝝓𝝔𝝕𝝖𝝗𝝘𝝙𝝚𝝛𝝜𝝝𝝞𝝟𝝠𝝡𝝢𝝣𝝤𝝥𝝦𝝧𝝨𝝩𝝪𝝫𝝬𝝭𝝮𝝯𝝰𝝱𝝲𝝳𝝴𝝵𝝶𝝷𝝸𝝹𝝺";
     private static final String unicodeText =
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java
index d99c9f5b8a..3bd3012ef5 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java
@@ -53,7 +53,7 @@ import org.junit.jupiter.api.Test;
 import org.openxmlformats.schemas.officeDocument.x2006.sharedTypes.STTrueFalse;
 import org.openxmlformats.schemas.officeDocument.x2006.sharedTypes.STTrueFalseBlank;
 
-public class TestXSSFVMLDrawing {
+class TestXSSFVMLDrawing {
 
     @Test
     void testNew() throws IOException, XmlException {
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSF3DChartData.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSF3DChartData.java
index 1f2bd9a822..9a4bcf5c1e 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSF3DChartData.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSF3DChartData.java
@@ -47,7 +47,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Tests for XSSF Area3d Charts
  */
-public class TestXSSF3DChartData {
+class TestXSSF3DChartData {
 
     private static final Object[][] plotData = {
             {"A", "B", "C", "D", "E", "F", "G", "H", "I", "J"},
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java
index d646fddd8f..c69af22ce4 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java
@@ -52,7 +52,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Test get/set chart title.
  */
-public class TestXSSFChartTitle {
+class TestXSSFChartTitle {
     private XSSFWorkbook createWorkbookWithChart() {
     	XSSFWorkbook wb = new XSSFWorkbook();
     	XSSFSheet sheet = wb.createSheet("linechart");
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java
index ea790a5fc6..faa4cb0fc2 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java
@@ -42,7 +42,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Tests for XSSF Line Charts
  */
-public class TestXSSFLineChartData {
+class TestXSSFLineChartData {
 
     private static final Object[][] plotData = {
             {"A", "B", "C", "D", "E", "F", "G", "H", "I", "J"},
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java
index 52f90cca79..5f905d8e7d 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java
@@ -28,7 +28,7 @@ import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTStylesheet;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.STBorderStyle;
 
 
-public class TestXSSFBorder {
+class TestXSSFBorder {
 
 	@Test
 	void testGetBorderStyle() {
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java
index 9b2b91d0c0..735b0d5413 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java
@@ -37,7 +37,7 @@ import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPatternFill;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.STPatternType;
 
 
-public class TestXSSFCellFill {
+class TestXSSFCellFill {
 
     @Test
     void testGetFillBackgroundColor() {
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFHeaderFooter.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFHeaderFooter.java
index 4cfc898028..6238a41713 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFHeaderFooter.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFHeaderFooter.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTHeaderFooter;
 
-public class TestXSSFHeaderFooter {
+class TestXSSFHeaderFooter {
 
     private XSSFWorkbook wb;
     private XSSFSheet sheet;
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java
index 122f609032..c8011af886 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
  * As we go through XmlBeans, should always use &,
  *  and not &amp;
  */
-public class TestHeaderFooterHelper {
+class TestHeaderFooterHelper {
 
     @Test
     void testGetCenterLeftRightSection() {
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestXSSFColumnShifting.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestXSSFColumnShifting.java
index 67767aea50..57591916d4 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestXSSFColumnShifting.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestXSSFColumnShifting.java
@@ -22,7 +22,7 @@ import org.apache.poi.ss.usermodel.BaseTestColumnShifting;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
-public class TestXSSFColumnShifting extends BaseTestColumnShifting {
+class TestXSSFColumnShifting extends BaseTestColumnShifting {
     public TestXSSFColumnShifting() {
         super(); 
         wb = new XSSFWorkbook();
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/util/TestNumericRanges.java b/src/ooxml/testcases/org/apache/poi/xssf/util/TestNumericRanges.java
index d0d6469a83..856ea584bc 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/util/TestNumericRanges.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/util/TestNumericRanges.java
@@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
 
 
-public class TestNumericRanges {
+class TestNumericRanges {
 
     @Test
     void testGetOverlappingType() {
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java b/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java
index a92ac3d0a7..4aac209eb9 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java
@@ -33,7 +33,7 @@ import org.apache.poi.xwpf.usermodel.XWPFParagraph;
 import org.apache.poi.xwpf.usermodel.XWPFRun;
 import org.junit.jupiter.api.Test;
 
-public class TestDocumentProtection {
+class TestDocumentProtection {
 
     @Test
     void testShouldReadEnforcementProperties() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java b/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java
index ad40ddac01..0b09c3b635 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java
@@ -27,7 +27,7 @@ import org.openxmlformats.schemas.wordprocessingml.x2006.main.STEm;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTblLayoutType;
 
 // aim is to get these classes loaded and included in poi-ooxml-lite.jar
-public class TestNecessaryOOXMLClasses {
+class TestNecessaryOOXMLClasses {
 
     @Test
     void testProblemClasses() {
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java b/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java
index 4f7ffa2648..48b8d093da 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java
@@ -42,7 +42,7 @@ import org.apache.xmlbeans.XmlException;
 import org.junit.jupiter.api.Test;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.DocumentDocument;
 
-public class TestXWPFBugs {
+class TestXWPFBugs {
     private static final POIDataSamples samples = POIDataSamples.getDocumentInstance();
 
     @Test
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestExternalEntities.java b/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestExternalEntities.java
index 9df07592a8..d7c5f1e4b3 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestExternalEntities.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestExternalEntities.java
@@ -26,7 +26,7 @@ import org.apache.poi.xwpf.XWPFTestDataSamples;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.junit.jupiter.api.Test;
 
-public class TestExternalEntities {
+class TestExternalEntities {
 
     /**
      * Get text out of the simple file
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java b/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
index 06b65352f3..55d224e9c8 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
@@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Tests for HXFWordExtractor
  */
-public class TestXWPFWordExtractor {
+class TestXWPFWordExtractor {
 
     /**
      * Get text out of the simple file
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFDecorators.java b/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFDecorators.java
index c9caf13d91..d908d2c565 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFDecorators.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFDecorators.java
@@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 /**
  * Tests for the various XWPF decorators
  */
-public class TestXWPFDecorators {
+class TestXWPFDecorators {
     private XWPFDocument simple;
     private XWPFDocument hyperlink;
     private XWPFDocument comments;
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java b/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java
index 8030f023cb..d47d5ae944 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java
@@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 /**
  * Tests for XWPF Header Footer Stuff
  */
-public class TestXWPFHeaderFooterPolicy {
+class TestXWPFHeaderFooterPolicy {
     private XWPFDocument noHeader;
     private XWPFDocument header;
     private XWPFDocument headerFooter;
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestChangeTracking.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestChangeTracking.java
index 53f13d9b96..39673c3bba 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestChangeTracking.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestChangeTracking.java
@@ -25,7 +25,7 @@ import java.io.ByteArrayOutputStream;
 import org.apache.poi.xwpf.XWPFTestDataSamples;
 import org.junit.jupiter.api.Test;
 
-public class TestChangeTracking {
+class TestChangeTracking {
     @Test
     void detection() throws Exception {
         try (XWPFDocument documentWithoutChangeTracking = XWPFTestDataSamples.openSampleDocument("bug56075-changeTracking_off.docx")) {
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestColumn.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestColumn.java
index 462f52e8a6..de8d9541b9 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestColumn.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestColumn.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
 import java.io.IOException;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestColumn {
+class TestColumn {
     @Test
     void testAddNewColWithCorrectAmountOfColumns() throws IOException {
         XWPFDocument doc = new XWPFDocument();
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java
index 859b293995..c3505d42fb 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java
@@ -33,7 +33,7 @@ import org.apache.poi.xwpf.usermodel.XWPFRun.FontCharRange;
 import org.junit.jupiter.api.Test;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTAbstractNum;
 
-public class TestXWPFBugs {
+class TestXWPFBugs {
     @Test
     void bug55802() throws Exception {
         String blabla =
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFChart.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFChart.java
index d0da4cbbcb..c01846636c 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFChart.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFChart.java
@@ -35,7 +35,7 @@ import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraph;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-public class TestXWPFChart {
+class TestXWPFChart {
 
     /**
      * test method to check charts are not null
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFComment.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFComment.java
index e6197bf894..5f0d8995da 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFComment.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFComment.java
@@ -23,7 +23,7 @@ import java.io.IOException;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class TestXWPFComment {
+class TestXWPFComment {
     @Test
     void testText() throws IOException {
         try (XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("comment.docx")) {
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java
index 7a91fcfdf0..e375d710fb 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFtnEdnRef;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR;
 
-public class TestXWPFEndnote {
+class TestXWPFEndnote {
 
     private XWPFDocument docOut;
     private String p1Text;
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnotes.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnotes.java
index 770f24d88b..7292553715 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnotes.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnotes.java
@@ -28,7 +28,7 @@ import org.apache.poi.xwpf.XWPFTestDataSamples;
 import org.junit.jupiter.api.Test;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.STFtnEdn;
 
-public class TestXWPFEndnotes {
+class TestXWPFEndnotes {
 
     @Test
     void testCreateEndnotes() throws IOException{
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java
index a74a3d07d9..9d8e563326 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFtnEdnRef;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR;
 
-public class TestXWPFFootnote {
+class TestXWPFFootnote {
 
     private XWPFDocument docOut;
     private String p1Text;
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java
index 0f61d7c76c..e73baa056c 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 
-public class TestXWPFFootnotes {
+class TestXWPFFootnotes {
     @Test
     void testCreateFootnotes() throws IOException{
         try (XWPFDocument docOut = new XWPFDocument()) {
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java
index 18ea0e1c64..c1806c946a 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java
@@ -30,7 +30,7 @@ import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTAbstractNum;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTNum;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTNumLvl;
 
-public class TestXWPFNumbering {
+class TestXWPFNumbering {
 
     @Test
     void testCompareAbstractNum() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java
index b12e4e90a4..7deb6f22a6 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java
@@ -36,7 +36,7 @@ import org.apache.poi.xwpf.model.XWPFHeaderFooterPolicy;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-public class TestXWPFPictureData {
+class TestXWPFPictureData {
 
     @Test
     void testRead() throws InvalidFormatException, IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
index d3d33ad742..bf4f7c1dfa 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
@@ -58,7 +58,7 @@ import org.openxmlformats.schemas.wordprocessingml.x2006.main.STUnderline;
 /**
  * Tests for XWPF Run
  */
-public class TestXWPFRun {
+class TestXWPFRun {
     private CTR ctRun;
     private XWPFParagraph p;
     private IRunBody irb;
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTable.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTable.java
index e7cf38426f..0feddb6819 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTable.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTable.java
@@ -43,7 +43,7 @@ import org.openxmlformats.schemas.wordprocessingml.x2006.main.STBorder;
 /**
  * Tests for XWPF Tables
  */
-public class TestXWPFTable {
+class TestXWPFTable {
 
     @Test
     void testConstructor() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java
index cdc92bb6a7..565fc7284c 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java
@@ -45,7 +45,7 @@ import org.openxmlformats.schemas.wordprocessingml.x2006.main.STVerticalJc;
 
 import java.util.List;
 
-public class TestXWPFTableCell {
+class TestXWPFTableCell {
 
     @Test
     void testSetGetVertAlignment() {
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java
index 4c95be51f6..d2ed3867ed 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java
@@ -28,7 +28,7 @@ import org.apache.poi.xwpf.XWPFTestDataSamples;
 import org.junit.jupiter.api.Test;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.STHeightRule;
 
-public class TestXWPFTableRow {
+class TestXWPFTableRow {
 
     @Test
     void testCreateRow() throws IOException {