diff --git a/src/ooxml/java/org/apache/poi/util/OOXMLLite.java b/src/ooxml/java/org/apache/poi/util/OOXMLLite.java
index 5d783e087..c8d361049 100644
--- a/src/ooxml/java/org/apache/poi/util/OOXMLLite.java
+++ b/src/ooxml/java/org/apache/poi/util/OOXMLLite.java
@@ -104,6 +104,8 @@ public final class OOXMLLite {
                 "TestDataSamples",
                 "All.+Tests",
                 "ZipFileAssert",
+                "AesZipFileZipEntrySource",
+                "TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource",
                 "PkiTestUtils",
                 "TestCellFormatPart\\$\\d",
                 "TestSignatureInfo\\$\\d",
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
index 231d64e72..563c55f45 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
@@ -381,7 +381,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
     /**
      * Verify that the candidate region does not intersect with an existing multi-cell array formula in this sheet
      *
-     * @param region
+     * @param region a region that is validated.
      * @throws IllegalStateException if candidate region intersects an existing array formula in this sheet
      */
     private void validateArrayFormulas(CellRangeAddress region) {
@@ -4217,10 +4217,9 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
     /**
      * Create a pivot table using the AreaReference or named/table range on sourceSheet, at the given position.
      * If the source reference contains a sheet name, it must match the sourceSheet.
-     * @param sourceRef location of pivot data - mutually exclusive with SourceName
-     * @param sourceName range or table name for pivot data - mutually exclusive with SourceRef
      * @param position A reference to the top left cell where the pivot table will start
      * @param sourceSheet The sheet containing the source data, if the source reference doesn't contain a sheet name
+     * @param refConfig A reference to the pivot table configurator
      * @throws IllegalArgumentException if source references a sheet different than sourceSheet
      * @return The pivot table
      */
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
index 26449f011..6cf7003ce 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
@@ -85,6 +85,7 @@ import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDefinedNames;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.impl.CTFontImpl;
 
+@SuppressWarnings("deprecation")
 public final class TestXSSFBugs extends BaseTestBugzillaIssues {
     public TestXSSFBugs() {
         super(XSSFITestDataProvider.instance);
@@ -135,7 +136,6 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues {
 
     /**
      * We should carry vba macros over after save
-     * @throws InvalidFormatException 
      */
     @Test
     public void bug45431() throws IOException, InvalidFormatException {
@@ -1824,7 +1824,6 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues {
     /**
      * New hyperlink with no initial cell reference, still need
      *  to be able to change it
-     * @throws IOException
      */
     @Test
     public void testBug56527() throws IOException {
@@ -2251,7 +2250,6 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues {
      * Expected:
 
      * [  0][  2][  4]
-     * @throws IOException
      */
     @Test
     public void testBug56820_Formula1() throws IOException {
@@ -2282,7 +2280,6 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues {
      * [  0] <- number
      * [  2] <- formula
      * [  4] <- formula
-     * @throws IOException
      */
     @Test
     public void testBug56820_Formula2() throws IOException {
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java
index 026036548..9adc5312f 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java
@@ -17,22 +17,20 @@
 
 package org.apache.poi.xssf.usermodel;
 
-import java.io.IOException;
-import java.util.TreeMap;
-
 import junit.framework.TestCase;
-
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.xssf.XSSFTestDataSamples;
 import org.apache.poi.xssf.model.StylesTable;
-import org.junit.Test;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFont;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRPrElt;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRst;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.STXstring;
 
+import java.io.IOException;
+import java.util.TreeMap;
+
 /**
  * Tests functionality of the XSSFRichTextRun object
  *