diff --git a/src/test/java/org/apache/datasketches/common/positional/PositionalSegmentTest.java b/src/test/java/org/apache/datasketches/common/positional/PositionalSegmentTest.java
index 86de3540d..f3bf385dc 100644
--- a/src/test/java/org/apache/datasketches/common/positional/PositionalSegmentTest.java
+++ b/src/test/java/org/apache/datasketches/common/positional/PositionalSegmentTest.java
@@ -29,10 +29,8 @@
 import static org.testng.Assert.assertEquals;
 
 import java.lang.foreign.MemorySegment;
-import java.util.List;
 
 import org.testng.annotations.Test;
-import org.testng.collections.Lists;
 
 public class PositionalSegmentTest {
 
diff --git a/src/test/java/org/apache/datasketches/common/positional/PositionalTest.java b/src/test/java/org/apache/datasketches/common/positional/PositionalTest.java
index 63cf640f2..72af9423f 100644
--- a/src/test/java/org/apache/datasketches/common/positional/PositionalTest.java
+++ b/src/test/java/org/apache/datasketches/common/positional/PositionalTest.java
@@ -23,8 +23,6 @@
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
-import java.lang.foreign.MemorySegment;
-
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/count/CountMinSketchTest.java b/src/test/java/org/apache/datasketches/count/CountMinSketchTest.java
index bb0bef806..0f37c1a71 100644
--- a/src/test/java/org/apache/datasketches/count/CountMinSketchTest.java
+++ b/src/test/java/org/apache/datasketches/count/CountMinSketchTest.java
@@ -19,16 +19,15 @@
 
 package org.apache.datasketches.count;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertThrows;
+import static org.testng.Assert.assertTrue;
+
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.common.SketchesException;
 import org.testng.annotations.Test;
 
-import java.io.ByteArrayOutputStream;
-import java.lang.annotation.Repeatable;
-import java.nio.ByteBuffer;
-
-import static org.testng.Assert.*;
-
 public class CountMinSketchTest {
 
   @Test
diff --git a/src/test/java/org/apache/datasketches/fdt/FdtSketchTest.java b/src/test/java/org/apache/datasketches/fdt/FdtSketchTest.java
index 4c1527b7a..33d9acfc4 100644
--- a/src/test/java/org/apache/datasketches/fdt/FdtSketchTest.java
+++ b/src/test/java/org/apache/datasketches/fdt/FdtSketchTest.java
@@ -27,9 +27,6 @@
 import java.util.List;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.fdt.FdtSketch;
-import org.apache.datasketches.fdt.Group;
-import org.apache.datasketches.fdt.PostProcessor;
 import org.apache.datasketches.tuple.TupleSketchIterator;
 import org.apache.datasketches.tuple.strings.ArrayOfStringsSummary;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/fdt/GroupTest.java b/src/test/java/org/apache/datasketches/fdt/GroupTest.java
index 2d84a0d1d..21427fb0b 100644
--- a/src/test/java/org/apache/datasketches/fdt/GroupTest.java
+++ b/src/test/java/org/apache/datasketches/fdt/GroupTest.java
@@ -21,7 +21,6 @@
 
 import static org.testng.Assert.assertEquals;
 
-import org.apache.datasketches.fdt.Group;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/filters/bloomfilter/BloomFilterBuilderTest.java b/src/test/java/org/apache/datasketches/filters/bloomfilter/BloomFilterBuilderTest.java
index b4dd9119d..2d6cfdbfe 100644
--- a/src/test/java/org/apache/datasketches/filters/bloomfilter/BloomFilterBuilderTest.java
+++ b/src/test/java/org/apache/datasketches/filters/bloomfilter/BloomFilterBuilderTest.java
@@ -25,8 +25,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.filters.bloomfilter.BloomFilter;
-import org.apache.datasketches.filters.bloomfilter.BloomFilterBuilder;
 import org.testng.annotations.Test;
 
 public class BloomFilterBuilderTest {
diff --git a/src/test/java/org/apache/datasketches/filters/bloomfilter/BloomFilterTest.java b/src/test/java/org/apache/datasketches/filters/bloomfilter/BloomFilterTest.java
index 6bf67ab31..71bc27ebc 100644
--- a/src/test/java/org/apache/datasketches/filters/bloomfilter/BloomFilterTest.java
+++ b/src/test/java/org/apache/datasketches/filters/bloomfilter/BloomFilterTest.java
@@ -29,17 +29,14 @@
 import static org.testng.Assert.assertThrows;
 import static org.testng.Assert.assertTrue;
 
+import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.Family;
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.common.SketchesReadOnlyException;
-import org.apache.datasketches.filters.bloomfilter.BloomFilter;
-import org.apache.datasketches.filters.bloomfilter.BloomFilterBuilder;
 import org.testng.annotations.Test;
 
-import java.lang.foreign.Arena;
-
 public class BloomFilterTest {
 
   @Test
diff --git a/src/test/java/org/apache/datasketches/filters/bloomfilter/DirectBitArrayRTest.java b/src/test/java/org/apache/datasketches/filters/bloomfilter/DirectBitArrayRTest.java
index 0d08f9ae5..d0ba97693 100644
--- a/src/test/java/org/apache/datasketches/filters/bloomfilter/DirectBitArrayRTest.java
+++ b/src/test/java/org/apache/datasketches/filters/bloomfilter/DirectBitArrayRTest.java
@@ -28,11 +28,9 @@
 
 import java.lang.foreign.MemorySegment;
 
-import org.apache.datasketches.common.positional.PositionalSegment;
-import org.apache.datasketches.filters.bloomfilter.DirectBitArrayR;
-import org.apache.datasketches.filters.bloomfilter.HeapBitArray;
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.common.SketchesReadOnlyException;
+import org.apache.datasketches.common.positional.PositionalSegment;
 import org.testng.annotations.Test;
 
 public class DirectBitArrayRTest {
diff --git a/src/test/java/org/apache/datasketches/filters/bloomfilter/DirectBitArrayTest.java b/src/test/java/org/apache/datasketches/filters/bloomfilter/DirectBitArrayTest.java
index 88f7ffae6..c570ed4f4 100644
--- a/src/test/java/org/apache/datasketches/filters/bloomfilter/DirectBitArrayTest.java
+++ b/src/test/java/org/apache/datasketches/filters/bloomfilter/DirectBitArrayTest.java
@@ -19,13 +19,8 @@
 
 package org.apache.datasketches.filters.bloomfilter;
 
-import static java.lang.foreign.ValueLayout.JAVA_BYTE;
-import static java.lang.foreign.ValueLayout.JAVA_CHAR_UNALIGNED;
-import static java.lang.foreign.ValueLayout.JAVA_DOUBLE_UNALIGNED;
-import static java.lang.foreign.ValueLayout.JAVA_FLOAT_UNALIGNED;
 import static java.lang.foreign.ValueLayout.JAVA_INT_UNALIGNED;
 import static java.lang.foreign.ValueLayout.JAVA_LONG_UNALIGNED;
-import static java.lang.foreign.ValueLayout.JAVA_SHORT_UNALIGNED;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertThrows;
@@ -33,11 +28,8 @@
 
 import java.lang.foreign.MemorySegment;
 
-import org.apache.datasketches.common.positional.PositionalSegment;
-import org.apache.datasketches.filters.bloomfilter.BitArray;
-import org.apache.datasketches.filters.bloomfilter.DirectBitArray;
-import org.apache.datasketches.filters.bloomfilter.HeapBitArray;
 import org.apache.datasketches.common.SketchesArgumentException;
+import org.apache.datasketches.common.positional.PositionalSegment;
 import org.testng.annotations.Test;
 
 public class DirectBitArrayTest {
diff --git a/src/test/java/org/apache/datasketches/filters/bloomfilter/HeapBitArrayTest.java b/src/test/java/org/apache/datasketches/filters/bloomfilter/HeapBitArrayTest.java
index 6e8556442..ffdd04db5 100644
--- a/src/test/java/org/apache/datasketches/filters/bloomfilter/HeapBitArrayTest.java
+++ b/src/test/java/org/apache/datasketches/filters/bloomfilter/HeapBitArrayTest.java
@@ -26,9 +26,8 @@
 
 import java.lang.foreign.MemorySegment;
 
-import org.apache.datasketches.common.positional.PositionalSegment;
-import org.apache.datasketches.filters.bloomfilter.HeapBitArray;
 import org.apache.datasketches.common.SketchesArgumentException;
+import org.apache.datasketches.common.positional.PositionalSegment;
 import org.testng.annotations.Test;
 
 public class HeapBitArrayTest {
diff --git a/src/test/java/org/apache/datasketches/frequencies/HashMapStressTest.java b/src/test/java/org/apache/datasketches/frequencies/HashMapStressTest.java
index 6a123839c..50001d13a 100644
--- a/src/test/java/org/apache/datasketches/frequencies/HashMapStressTest.java
+++ b/src/test/java/org/apache/datasketches/frequencies/HashMapStressTest.java
@@ -19,7 +19,6 @@
 
 package org.apache.datasketches.frequencies;
 
-import org.apache.datasketches.frequencies.ReversePurgeLongHashMap;
 import org.apache.datasketches.hash.MurmurHash3;
 //import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/frequencies/ItemsSketchTest.java b/src/test/java/org/apache/datasketches/frequencies/ItemsSketchTest.java
index d77933444..e2628b877 100644
--- a/src/test/java/org/apache/datasketches/frequencies/ItemsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/frequencies/ItemsSketchTest.java
@@ -33,17 +33,14 @@
 import static org.testng.Assert.fail;
 
 import java.lang.foreign.MemorySegment;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 import org.apache.datasketches.common.ArrayOfLongsSerDe;
 import org.apache.datasketches.common.ArrayOfStringsSerDe;
 import org.apache.datasketches.common.ArrayOfUtf16StringsSerDe;
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.frequencies.ErrorType;
-import org.apache.datasketches.frequencies.FrequentItemsSketch;
-import org.apache.datasketches.frequencies.ReversePurgeItemHashMap;
 import org.apache.datasketches.frequencies.FrequentItemsSketch.Row;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 public class ItemsSketchTest {
 
diff --git a/src/test/java/org/apache/datasketches/frequencies/LongsSketchTest.java b/src/test/java/org/apache/datasketches/frequencies/LongsSketchTest.java
index 109ad8cd5..c5c56079c 100644
--- a/src/test/java/org/apache/datasketches/frequencies/LongsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/frequencies/LongsSketchTest.java
@@ -35,16 +35,12 @@
 import static org.testng.Assert.fail;
 
 import java.lang.foreign.MemorySegment;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.common.Util;
-import org.apache.datasketches.frequencies.ErrorType;
-import org.apache.datasketches.frequencies.FrequentLongsSketch;
-import org.apache.datasketches.frequencies.PreambleUtil;
-import org.apache.datasketches.frequencies.ReversePurgeLongHashMap;
 import org.apache.datasketches.frequencies.FrequentLongsSketch.Row;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 public class LongsSketchTest {
 
diff --git a/src/test/java/org/apache/datasketches/frequencies/ReversePurgeLongHashMapTest.java b/src/test/java/org/apache/datasketches/frequencies/ReversePurgeLongHashMapTest.java
index b4524a25a..0be99b101 100644
--- a/src/test/java/org/apache/datasketches/frequencies/ReversePurgeLongHashMapTest.java
+++ b/src/test/java/org/apache/datasketches/frequencies/ReversePurgeLongHashMapTest.java
@@ -22,7 +22,6 @@
 import static org.testng.Assert.assertNull;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.frequencies.ReversePurgeLongHashMap;
 import org.testng.annotations.Test;
 
 public class ReversePurgeLongHashMapTest {
diff --git a/src/test/java/org/apache/datasketches/frequencies/SerDeCompatibilityTest.java b/src/test/java/org/apache/datasketches/frequencies/SerDeCompatibilityTest.java
index c314a51e6..b632988f8 100644
--- a/src/test/java/org/apache/datasketches/frequencies/SerDeCompatibilityTest.java
+++ b/src/test/java/org/apache/datasketches/frequencies/SerDeCompatibilityTest.java
@@ -23,8 +23,6 @@
 
 import org.apache.datasketches.common.ArrayOfItemsSerDe;
 import org.apache.datasketches.common.ArrayOfLongsSerDe;
-import org.apache.datasketches.frequencies.FrequentItemsSketch;
-import org.apache.datasketches.frequencies.FrequentLongsSketch;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/hash/MurmurHash3FFMTest.java b/src/test/java/org/apache/datasketches/hash/MurmurHash3FFMTest.java
index 4e2bb00e7..b1f79468e 100644
--- a/src/test/java/org/apache/datasketches/hash/MurmurHash3FFMTest.java
+++ b/src/test/java/org/apache/datasketches/hash/MurmurHash3FFMTest.java
@@ -20,12 +20,8 @@
 package org.apache.datasketches.hash;
 
 import static java.lang.foreign.ValueLayout.JAVA_BYTE;
-import static java.lang.foreign.ValueLayout.JAVA_CHAR_UNALIGNED;
-import static java.lang.foreign.ValueLayout.JAVA_DOUBLE_UNALIGNED;
-import static java.lang.foreign.ValueLayout.JAVA_FLOAT_UNALIGNED;
 import static java.lang.foreign.ValueLayout.JAVA_INT_UNALIGNED;
 import static java.lang.foreign.ValueLayout.JAVA_LONG_UNALIGNED;
-import static java.lang.foreign.ValueLayout.JAVA_SHORT_UNALIGNED;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
diff --git a/src/test/java/org/apache/datasketches/hll/AuxHashMapTest.java b/src/test/java/org/apache/datasketches/hll/AuxHashMapTest.java
index 3f6a80fd4..9addfb3cd 100644
--- a/src/test/java/org/apache/datasketches/hll/AuxHashMapTest.java
+++ b/src/test/java/org/apache/datasketches/hll/AuxHashMapTest.java
@@ -24,8 +24,6 @@
 import static org.testng.Assert.fail;
 
 import org.apache.datasketches.common.SketchesStateException;
-import org.apache.datasketches.hll.HeapAuxHashMap;
-import org.apache.datasketches.hll.PairIterator;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/hll/BaseHllSketchTest.java b/src/test/java/org/apache/datasketches/hll/BaseHllSketchTest.java
index 0ba429b0e..54177c5d0 100644
--- a/src/test/java/org/apache/datasketches/hll/BaseHllSketchTest.java
+++ b/src/test/java/org/apache/datasketches/hll/BaseHllSketchTest.java
@@ -22,17 +22,11 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-import org.apache.datasketches.hll.BaseHllSketch;
-import org.apache.datasketches.hll.HllSketch;
-import org.apache.datasketches.hll.PreambleUtil;
-import org.apache.datasketches.hll.TgtHllType;
-import org.apache.datasketches.hll.HllUnion;
-import org.testng.annotations.Test;
-
 import java.lang.foreign.MemorySegment;
-
 import java.nio.ByteBuffer;
 
+import org.testng.annotations.Test;
+
 /**
  * @author Lee Rhodes
  *
diff --git a/src/test/java/org/apache/datasketches/hll/CouponListTest.java b/src/test/java/org/apache/datasketches/hll/CouponListTest.java
index df7c07cb2..b119109d8 100644
--- a/src/test/java/org/apache/datasketches/hll/CouponListTest.java
+++ b/src/test/java/org/apache/datasketches/hll/CouponListTest.java
@@ -26,11 +26,6 @@
 
 import java.lang.foreign.MemorySegment;
 
-import org.apache.datasketches.hll.AbstractCoupons;
-import org.apache.datasketches.hll.CurMode;
-import org.apache.datasketches.hll.HllSketch;
-import org.apache.datasketches.hll.PairIterator;
-import org.apache.datasketches.hll.TgtHllType;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/hll/DirectAuxHashMapTest.java b/src/test/java/org/apache/datasketches/hll/DirectAuxHashMapTest.java
index 6a2b54217..50f413a6b 100644
--- a/src/test/java/org/apache/datasketches/hll/DirectAuxHashMapTest.java
+++ b/src/test/java/org/apache/datasketches/hll/DirectAuxHashMapTest.java
@@ -32,16 +32,6 @@
 import java.util.HashMap;
 
 import org.apache.datasketches.common.SketchesStateException;
-import org.apache.datasketches.hll.AbstractHllArray;
-import org.apache.datasketches.hll.AuxHashMap;
-import org.apache.datasketches.hll.DirectAuxHashMap;
-import org.apache.datasketches.hll.DirectHllArray;
-import org.apache.datasketches.hll.HeapAuxHashMap;
-import org.apache.datasketches.hll.HllArray;
-import org.apache.datasketches.hll.HllSketch;
-import org.apache.datasketches.hll.HllUtil;
-import org.apache.datasketches.hll.PairIterator;
-import org.apache.datasketches.hll.TgtHllType;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/hll/DirectCouponListTest.java b/src/test/java/org/apache/datasketches/hll/DirectCouponListTest.java
index b3bdc63b6..044535d45 100644
--- a/src/test/java/org/apache/datasketches/hll/DirectCouponListTest.java
+++ b/src/test/java/org/apache/datasketches/hll/DirectCouponListTest.java
@@ -29,10 +29,6 @@
 import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
 
-import org.apache.datasketches.hll.AbstractCoupons;
-import org.apache.datasketches.hll.CurMode;
-import org.apache.datasketches.hll.HllSketch;
-import org.apache.datasketches.hll.TgtHllType;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/hll/DirectHllSketchTest.java b/src/test/java/org/apache/datasketches/hll/DirectHllSketchTest.java
index 4b9554b5e..117cc5a11 100644
--- a/src/test/java/org/apache/datasketches/hll/DirectHllSketchTest.java
+++ b/src/test/java/org/apache/datasketches/hll/DirectHllSketchTest.java
@@ -28,12 +28,6 @@
 
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.common.SketchesReadOnlyException;
-import org.apache.datasketches.hll.AbstractHllArray;
-import org.apache.datasketches.hll.CurMode;
-import org.apache.datasketches.hll.HllSketch;
-import org.apache.datasketches.hll.IntMemorySegmentPairIterator;
-import org.apache.datasketches.hll.PairIterator;
-import org.apache.datasketches.hll.TgtHllType;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/hll/DirectUnionTest.java b/src/test/java/org/apache/datasketches/hll/DirectUnionTest.java
index 114530a86..d788913c3 100644
--- a/src/test/java/org/apache/datasketches/hll/DirectUnionTest.java
+++ b/src/test/java/org/apache/datasketches/hll/DirectUnionTest.java
@@ -30,13 +30,8 @@
 
 import java.lang.foreign.MemorySegment;
 
-import org.testng.annotations.Test;
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.hll.HllSketch;
-import org.apache.datasketches.hll.HllUtil;
-import org.apache.datasketches.hll.RelativeErrorTables;
-import org.apache.datasketches.hll.TgtHllType;
-import org.apache.datasketches.hll.HllUnion;
+import org.testng.annotations.Test;
 
 /**
  * @author Lee Rhodes
diff --git a/src/test/java/org/apache/datasketches/hll/HllArrayTest.java b/src/test/java/org/apache/datasketches/hll/HllArrayTest.java
index 3bbb01db0..b7409b6fc 100644
--- a/src/test/java/org/apache/datasketches/hll/HllArrayTest.java
+++ b/src/test/java/org/apache/datasketches/hll/HllArrayTest.java
@@ -30,11 +30,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesStateException;
-import org.apache.datasketches.hll.AbstractHllArray;
-import org.apache.datasketches.hll.HllArray;
-import org.apache.datasketches.hll.HllSketch;
-import org.apache.datasketches.hll.TgtHllType;
-import org.apache.datasketches.hll.HllUnion;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/hll/HllSketchMergeOrderTest.java b/src/test/java/org/apache/datasketches/hll/HllSketchMergeOrderTest.java
index 1618f81e7..fb8b7dcb1 100644
--- a/src/test/java/org/apache/datasketches/hll/HllSketchMergeOrderTest.java
+++ b/src/test/java/org/apache/datasketches/hll/HllSketchMergeOrderTest.java
@@ -81,7 +81,7 @@ public void testDataSketchHLLMergeOrderDependency() {
      * @param limit the upper limit, exclusive
      * @return the loaded sketch
      */
-    private HllSketch createUniquePowerSeriesSketch(final long baseValue, final int ppo, final long limit) {
+    private static HllSketch createUniquePowerSeriesSketch(final long baseValue, final int ppo, final long limit) {
       final HllSketch sketch = new HllSketch(LgK);
       int count = 0;
       long lastp = 0;
@@ -97,7 +97,7 @@ private HllSketch createUniquePowerSeriesSketch(final long baseValue, final int
     /**
      * Merges three sketches in the specified order and returns the composite estimate
      */
-    private double mergeThreeSketches(final HllSketch s1, final HllSketch s2, final HllSketch s3) {
+    private static double mergeThreeSketches(final HllSketch s1, final HllSketch s2, final HllSketch s3) {
         final HllUnion union = new HllUnion(LgK);
 
         union.update(s1);
diff --git a/src/test/java/org/apache/datasketches/hll/HllSketchTest.java b/src/test/java/org/apache/datasketches/hll/HllSketchTest.java
index b9cc6f298..4b0d93e9f 100644
--- a/src/test/java/org/apache/datasketches/hll/HllSketchTest.java
+++ b/src/test/java/org/apache/datasketches/hll/HllSketchTest.java
@@ -38,16 +38,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.hll.AbstractCoupons;
-import org.apache.datasketches.hll.AbstractHllArray;
-import org.apache.datasketches.hll.AuxHashMap;
-import org.apache.datasketches.hll.CurMode;
-import org.apache.datasketches.hll.HllSketch;
-import org.apache.datasketches.hll.HllSketchImpl;
-import org.apache.datasketches.hll.HllUtil;
-import org.apache.datasketches.hll.PreambleUtil;
-import org.apache.datasketches.hll.TgtHllType;
-import org.apache.datasketches.hll.HllUnion;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/hll/PreambleUtilTest.java b/src/test/java/org/apache/datasketches/hll/PreambleUtilTest.java
index d0d4c592a..94d675dc4 100644
--- a/src/test/java/org/apache/datasketches/hll/PreambleUtilTest.java
+++ b/src/test/java/org/apache/datasketches/hll/PreambleUtilTest.java
@@ -35,10 +35,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.hll.CurMode;
-import org.apache.datasketches.hll.HllSketch;
-import org.apache.datasketches.hll.PreambleUtil;
-import org.apache.datasketches.hll.TgtHllType;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/hll/SizeAndModeTransitions.java b/src/test/java/org/apache/datasketches/hll/SizeAndModeTransitions.java
index 25173ea44..c00398b6e 100644
--- a/src/test/java/org/apache/datasketches/hll/SizeAndModeTransitions.java
+++ b/src/test/java/org/apache/datasketches/hll/SizeAndModeTransitions.java
@@ -23,8 +23,6 @@
 
 import java.lang.foreign.MemorySegment;
 
-import org.apache.datasketches.hll.HllSketch;
-import org.apache.datasketches.hll.TgtHllType;
 import org.testng.annotations.Test;
 
 public class SizeAndModeTransitions {
@@ -38,7 +36,7 @@ public void checkHLL8with_withoutSeg() {
     checkHLL8Heap(false);
   }
 
-  private void checkHLL8Heap(final boolean withSeg) {
+  private static void checkHLL8Heap(final boolean withSeg) {
     final TgtHllType tgtHllType = TgtHllType.HLL_8;
     final int lgK = 10;
     final int N = 97;
diff --git a/src/test/java/org/apache/datasketches/hll/ToFromByteArrayTest.java b/src/test/java/org/apache/datasketches/hll/ToFromByteArrayTest.java
index 537e8b99f..c0d3f0432 100644
--- a/src/test/java/org/apache/datasketches/hll/ToFromByteArrayTest.java
+++ b/src/test/java/org/apache/datasketches/hll/ToFromByteArrayTest.java
@@ -26,8 +26,6 @@
 
 import java.lang.foreign.MemorySegment;
 
-import org.apache.datasketches.hll.HllSketch;
-import org.apache.datasketches.hll.TgtHllType;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/kll/KllDirectCompactDoublesSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllDirectCompactDoublesSketchTest.java
index 5dd2a8699..de4d9ba19 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDirectCompactDoublesSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDirectCompactDoublesSketchTest.java
@@ -27,9 +27,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.kll.KllDirectDoublesSketch;
-import org.apache.datasketches.kll.KllDoublesSketch;
-import org.apache.datasketches.kll.KllHelper;
 import org.testng.annotations.Test;
 
 public class KllDirectCompactDoublesSketchTest {
diff --git a/src/test/java/org/apache/datasketches/kll/KllDirectCompactFloatsSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllDirectCompactFloatsSketchTest.java
index 512781c9c..bf5bd077a 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDirectCompactFloatsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDirectCompactFloatsSketchTest.java
@@ -27,11 +27,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.kll.KllDirectFloatsSketch;
-import org.apache.datasketches.kll.KllFloatsSketch;
-import org.apache.datasketches.kll.KllHelper;
-import org.apache.datasketches.kll.KllPreambleUtil;
-import org.apache.datasketches.kll.KllSketch.SketchType;
 import org.testng.annotations.Test;
 
 public class KllDirectCompactFloatsSketchTest {
diff --git a/src/test/java/org/apache/datasketches/kll/KllDirectCompactItemsSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllDirectCompactItemsSketchTest.java
index 4a1d0f176..ef3dcdabd 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDirectCompactItemsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDirectCompactItemsSketchTest.java
@@ -31,9 +31,6 @@
 import org.apache.datasketches.common.ArrayOfStringsSerDe;
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.common.Util;
-import org.apache.datasketches.kll.KllDirectCompactItemsSketch;
-import org.apache.datasketches.kll.KllHelper;
-import org.apache.datasketches.kll.KllItemsSketch;
 import org.testng.annotations.Test;
 
 public class KllDirectCompactItemsSketchTest {
diff --git a/src/test/java/org/apache/datasketches/kll/KllDirectCompactLongsSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllDirectCompactLongsSketchTest.java
index d4a373453..c47113105 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDirectCompactLongsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDirectCompactLongsSketchTest.java
@@ -27,9 +27,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.kll.KllDirectLongsSketch;
-import org.apache.datasketches.kll.KllHelper;
-import org.apache.datasketches.kll.KllLongsSketch;
 import org.apache.datasketches.kll.KllSketch.SketchStructure;
 import org.testng.annotations.Test;
 
@@ -79,13 +76,13 @@ public void checkRODirectCompact() {
     final MemorySegment srcSeg2 = MemorySegment.ofArray(sk2.toByteArray());
     // wrap it back to a sketch
     final KllLongsSketch sk3 = KllLongsSketch.wrap(srcSeg2);
-    assertTrue(sk2.hasMemorySegment());
-    assertTrue(sk2.sketchStructure == SketchStructure.COMPACT_FULL);
-    assertTrue(sk2.isCompactMemorySegmentFormat());
-    assertFalse(sk2.isMemorySegmentUpdatableFormat());
-    assertTrue(sk2.isReadOnly());
-    assertEquals(sk2.getMinItem(), 1L);
-    assertEquals(sk2.getMaxItem(), 21L);
+    assertTrue(sk3.hasMemorySegment());
+    assertTrue(sk3.sketchStructure == SketchStructure.COMPACT_FULL);
+    assertTrue(sk3.isCompactMemorySegmentFormat());
+    assertFalse(sk3.isMemorySegmentUpdatableFormat());
+    assertTrue(sk3.isReadOnly());
+    assertEquals(sk3.getMinItem(), 1L);
+    assertEquals(sk3.getMaxItem(), 21L);
   }
 
   @Test
diff --git a/src/test/java/org/apache/datasketches/kll/KllDirectDoublesSketchIteratorTest.java b/src/test/java/org/apache/datasketches/kll/KllDirectDoublesSketchIteratorTest.java
index 06a0b8ce1..6d7749638 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDirectDoublesSketchIteratorTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDirectDoublesSketchIteratorTest.java
@@ -21,8 +21,6 @@
 
 import java.lang.foreign.MemorySegment;
 
-import org.apache.datasketches.kll.KllDoublesSketch;
-import org.apache.datasketches.kll.KllHelper;
 import org.apache.datasketches.quantilescommon.QuantilesDoublesSketchIteratorAPI;
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/kll/KllDirectDoublesSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllDirectDoublesSketchTest.java
index 00cab5d32..8db7857f5 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDirectDoublesSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDirectDoublesSketchTest.java
@@ -30,12 +30,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.kll.KllDoublesSketch;
-import org.apache.datasketches.kll.KllFloatsSketch;
-import org.apache.datasketches.kll.KllHeapDoublesSketch;
-import org.apache.datasketches.kll.KllHelper;
-import org.apache.datasketches.kll.KllPreambleUtil;
-import org.apache.datasketches.kll.KllSketch;
 import org.apache.datasketches.kll.KllSketch.SketchStructure;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/kll/KllDirectFloatsSketchIteratorTest.java b/src/test/java/org/apache/datasketches/kll/KllDirectFloatsSketchIteratorTest.java
index b47c9ef18..ff7c4ac9e 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDirectFloatsSketchIteratorTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDirectFloatsSketchIteratorTest.java
@@ -21,8 +21,6 @@
 
 import java.lang.foreign.MemorySegment;
 
-import org.apache.datasketches.kll.KllFloatsSketch;
-import org.apache.datasketches.kll.KllHelper;
 import org.apache.datasketches.quantilescommon.QuantilesFloatsSketchIterator;
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/kll/KllDirectFloatsSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllDirectFloatsSketchTest.java
index ca1e35463..39798ae93 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDirectFloatsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDirectFloatsSketchTest.java
@@ -30,12 +30,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.kll.KllDoublesSketch;
-import org.apache.datasketches.kll.KllFloatsSketch;
-import org.apache.datasketches.kll.KllHeapFloatsSketch;
-import org.apache.datasketches.kll.KllHelper;
-import org.apache.datasketches.kll.KllPreambleUtil;
-import org.apache.datasketches.kll.KllSketch;
 import org.apache.datasketches.kll.KllSketch.SketchStructure;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/kll/KllDirectLongsSketchIteratorTest.java b/src/test/java/org/apache/datasketches/kll/KllDirectLongsSketchIteratorTest.java
index 83228b293..2904d6ffb 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDirectLongsSketchIteratorTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDirectLongsSketchIteratorTest.java
@@ -21,8 +21,6 @@
 
 import java.lang.foreign.MemorySegment;
 
-import org.apache.datasketches.kll.KllHelper;
-import org.apache.datasketches.kll.KllLongsSketch;
 import org.apache.datasketches.quantilescommon.QuantilesLongsSketchIterator;
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/kll/KllDirectLongsSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllDirectLongsSketchTest.java
index e4c3438ea..277c3a403 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDirectLongsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDirectLongsSketchTest.java
@@ -30,12 +30,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.kll.KllDoublesSketch;
-import org.apache.datasketches.kll.KllHeapLongsSketch;
-import org.apache.datasketches.kll.KllHelper;
-import org.apache.datasketches.kll.KllLongsSketch;
-import org.apache.datasketches.kll.KllPreambleUtil;
-import org.apache.datasketches.kll.KllSketch;
 import org.apache.datasketches.kll.KllSketch.SketchStructure;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/kll/KllDoublesSketchIteratorTest.java b/src/test/java/org/apache/datasketches/kll/KllDoublesSketchIteratorTest.java
index ff66caccd..6afe392a7 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDoublesSketchIteratorTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDoublesSketchIteratorTest.java
@@ -24,7 +24,6 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-import org.apache.datasketches.kll.KllDoublesSketch;
 import org.apache.datasketches.quantilescommon.DoublesSortedViewIterator;
 import org.apache.datasketches.quantilescommon.QuantilesDoublesSketchIteratorAPI;
 import org.testng.Assert;
diff --git a/src/test/java/org/apache/datasketches/kll/KllDoublesSketchSerDeTest.java b/src/test/java/org/apache/datasketches/kll/KllDoublesSketchSerDeTest.java
index e0aa282af..5721f8b12 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDoublesSketchSerDeTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDoublesSketchSerDeTest.java
@@ -27,7 +27,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.kll.KllDoublesSketch;
 import org.testng.annotations.Test;
 
 public class KllDoublesSketchSerDeTest {
diff --git a/src/test/java/org/apache/datasketches/kll/KllDoublesSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllDoublesSketchTest.java
index f2706af79..09167afc3 100644
--- a/src/test/java/org/apache/datasketches/kll/KllDoublesSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllDoublesSketchTest.java
@@ -19,8 +19,8 @@
 
 package org.apache.datasketches.kll;
 
-import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 import static java.lang.Math.min;
+import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_DOUBLES_SKETCH;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.EXCLUSIVE;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.INCLUSIVE;
@@ -34,9 +34,6 @@
 
 import org.apache.datasketches.common.MemorySegmentStatus;
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.kll.KllDoublesSketch;
-import org.apache.datasketches.kll.KllHelper;
-import org.apache.datasketches.kll.KllSketch;
 import org.apache.datasketches.quantilescommon.DoublesSortedView;
 import org.apache.datasketches.quantilescommon.DoublesSortedViewIterator;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/kll/KllFloatsSketchIteratorTest.java b/src/test/java/org/apache/datasketches/kll/KllFloatsSketchIteratorTest.java
index f89253b21..88003b836 100644
--- a/src/test/java/org/apache/datasketches/kll/KllFloatsSketchIteratorTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllFloatsSketchIteratorTest.java
@@ -24,7 +24,6 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-import org.apache.datasketches.kll.KllFloatsSketch;
 import org.apache.datasketches.quantilescommon.FloatsSortedViewIterator;
 import org.apache.datasketches.quantilescommon.QuantilesFloatsSketchIterator;
 import org.testng.Assert;
diff --git a/src/test/java/org/apache/datasketches/kll/KllFloatsSketchSerDeTest.java b/src/test/java/org/apache/datasketches/kll/KllFloatsSketchSerDeTest.java
index aa05ca0a2..ed9954f77 100644
--- a/src/test/java/org/apache/datasketches/kll/KllFloatsSketchSerDeTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllFloatsSketchSerDeTest.java
@@ -27,7 +27,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.kll.KllFloatsSketch;
 import org.testng.annotations.Test;
 
 public class KllFloatsSketchSerDeTest {
diff --git a/src/test/java/org/apache/datasketches/kll/KllFloatsSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllFloatsSketchTest.java
index 06d81bf09..f5b533051 100644
--- a/src/test/java/org/apache/datasketches/kll/KllFloatsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllFloatsSketchTest.java
@@ -19,8 +19,8 @@
 
 package org.apache.datasketches.kll;
 
-import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 import static java.lang.Math.min;
+import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_FLOATS_SKETCH;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.EXCLUSIVE;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.INCLUSIVE;
@@ -34,9 +34,6 @@
 
 import org.apache.datasketches.common.MemorySegmentStatus;
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.kll.KllFloatsSketch;
-import org.apache.datasketches.kll.KllHelper;
-import org.apache.datasketches.kll.KllSketch;
 import org.apache.datasketches.quantilescommon.FloatsSortedView;
 import org.apache.datasketches.quantilescommon.FloatsSortedViewIterator;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/kll/KllHelperTest.java b/src/test/java/org/apache/datasketches/kll/KllHelperTest.java
index 5acb068a0..d7771a11f 100644
--- a/src/test/java/org/apache/datasketches/kll/KllHelperTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllHelperTest.java
@@ -20,30 +20,18 @@
 package org.apache.datasketches.kll;
 
 import static org.apache.datasketches.kll.KllHelper.checkM;
-import static org.apache.datasketches.kll.KllSketch.getMaxSerializedSizeBytes;
-import static org.apache.datasketches.kll.KllSketch.SketchType.*;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_DOUBLES_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_FLOATS_SKETCH;
+import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_ITEMS_SKETCH;
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
-import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
 import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.Hashtable;
 
 import org.apache.datasketches.common.ArrayOfStringsSerDe;
-import org.apache.datasketches.common.MemorySegmentRequest;
-import org.apache.datasketches.common.MemorySegmentStatus;
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.common.Util;
-import org.apache.datasketches.kll.KllDoublesSketch;
-import org.apache.datasketches.kll.KllFloatsSketch;
-import org.apache.datasketches.kll.KllHelper;
-import org.apache.datasketches.kll.KllItemsSketch;
-import org.apache.datasketches.kll.KllSketch;
-import org.apache.datasketches.kll.KllSketch.SketchType;
 import org.testng.annotations.Test;
 
 public class KllHelperTest {
diff --git a/src/test/java/org/apache/datasketches/kll/KllItemsSketchSerDeTest.java b/src/test/java/org/apache/datasketches/kll/KllItemsSketchSerDeTest.java
index be0c405c2..0e5384286 100644
--- a/src/test/java/org/apache/datasketches/kll/KllItemsSketchSerDeTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllItemsSketchSerDeTest.java
@@ -30,7 +30,6 @@
 import org.apache.datasketches.common.ArrayOfStringsSerDe;
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.common.Util;
-import org.apache.datasketches.kll.KllItemsSketch;
 import org.testng.annotations.Test;
 
 public class KllItemsSketchSerDeTest {
diff --git a/src/test/java/org/apache/datasketches/kll/KllItemsSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllItemsSketchTest.java
index 193c1e502..d9e822b6a 100644
--- a/src/test/java/org/apache/datasketches/kll/KllItemsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllItemsSketchTest.java
@@ -19,9 +19,9 @@
 
 package org.apache.datasketches.kll;
 
+import static java.lang.Math.ceil;
 import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 import static java.lang.foreign.ValueLayout.JAVA_INT_UNALIGNED;
-import static java.lang.Math.ceil;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_EMPTY;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_FULL;
 import static org.apache.datasketches.kll.KllSketch.SketchStructure.COMPACT_SINGLE;
@@ -44,10 +44,6 @@
 import org.apache.datasketches.common.MemorySegmentStatus;
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.common.Util;
-import org.apache.datasketches.kll.KllItemsSketch;
-import org.apache.datasketches.kll.KllMemorySegmentValidate;
-import org.apache.datasketches.kll.KllPreambleUtil;
-import org.apache.datasketches.kll.KllSketch;
 import org.apache.datasketches.kll.KllSketch.SketchType;
 import org.apache.datasketches.quantilescommon.GenericSortedView;
 import org.apache.datasketches.quantilescommon.GenericSortedViewIterator;
diff --git a/src/test/java/org/apache/datasketches/kll/KllItemsSketchiteratorTest.java b/src/test/java/org/apache/datasketches/kll/KllItemsSketchiteratorTest.java
index 1e8623b47..d42d132b5 100644
--- a/src/test/java/org/apache/datasketches/kll/KllItemsSketchiteratorTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllItemsSketchiteratorTest.java
@@ -28,7 +28,6 @@
 
 import org.apache.datasketches.common.ArrayOfStringsSerDe;
 import org.apache.datasketches.common.Util;
-import org.apache.datasketches.kll.KllItemsSketch;
 import org.apache.datasketches.quantilescommon.GenericSortedViewIterator;
 import org.apache.datasketches.quantilescommon.QuantilesGenericSketchIteratorAPI;
 import org.testng.Assert;
diff --git a/src/test/java/org/apache/datasketches/kll/KllLongsSketchIteratorTest.java b/src/test/java/org/apache/datasketches/kll/KllLongsSketchIteratorTest.java
index 69d947afd..983ea16ef 100644
--- a/src/test/java/org/apache/datasketches/kll/KllLongsSketchIteratorTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllLongsSketchIteratorTest.java
@@ -19,17 +19,16 @@
 
 package org.apache.datasketches.kll;
 
-import org.apache.datasketches.kll.KllLongsSketch;
-import org.apache.datasketches.quantilescommon.LongsSortedViewIterator;
-import org.apache.datasketches.quantilescommon.QuantilesLongsSketchIterator;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.EXCLUSIVE;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.INCLUSIVE;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
+import org.apache.datasketches.quantilescommon.LongsSortedViewIterator;
+import org.apache.datasketches.quantilescommon.QuantilesLongsSketchIterator;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
 public class KllLongsSketchIteratorTest {
 
   @Test
diff --git a/src/test/java/org/apache/datasketches/kll/KllLongsSketchSerDeTest.java b/src/test/java/org/apache/datasketches/kll/KllLongsSketchSerDeTest.java
index c36f0a4f4..42f62fdcf 100644
--- a/src/test/java/org/apache/datasketches/kll/KllLongsSketchSerDeTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllLongsSketchSerDeTest.java
@@ -27,7 +27,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.kll.KllLongsSketch;
 import org.testng.annotations.Test;
 
 public class KllLongsSketchSerDeTest {
diff --git a/src/test/java/org/apache/datasketches/kll/KllLongsSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllLongsSketchTest.java
index 0721d6335..536238083 100644
--- a/src/test/java/org/apache/datasketches/kll/KllLongsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllLongsSketchTest.java
@@ -19,8 +19,8 @@
 
 package org.apache.datasketches.kll;
 
-import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 import static java.lang.Math.min;
+import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 import static org.apache.datasketches.kll.KllSketch.SketchType.KLL_LONGS_SKETCH;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.EXCLUSIVE;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.INCLUSIVE;
@@ -34,9 +34,6 @@
 
 import org.apache.datasketches.common.MemorySegmentStatus;
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.kll.KllHelper;
-import org.apache.datasketches.kll.KllLongsSketch;
-import org.apache.datasketches.kll.KllSketch;
 import org.apache.datasketches.quantilescommon.LongsSortedView;
 import org.apache.datasketches.quantilescommon.LongsSortedViewIterator;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/kll/KllMemorySegmentRequestApp.java b/src/test/java/org/apache/datasketches/kll/KllMemorySegmentRequestApp.java
index 893379cdc..24915dde9 100644
--- a/src/test/java/org/apache/datasketches/kll/KllMemorySegmentRequestApp.java
+++ b/src/test/java/org/apache/datasketches/kll/KllMemorySegmentRequestApp.java
@@ -22,7 +22,6 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.MemorySegmentRequestExample;
diff --git a/src/test/java/org/apache/datasketches/kll/KllMiscDirectDoublesTest.java b/src/test/java/org/apache/datasketches/kll/KllMiscDirectDoublesTest.java
index 88437488b..801462340 100644
--- a/src/test/java/org/apache/datasketches/kll/KllMiscDirectDoublesTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllMiscDirectDoublesTest.java
@@ -28,11 +28,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.kll.KllDirectDoublesSketch;
-import org.apache.datasketches.kll.KllDoublesSketch;
-import org.apache.datasketches.kll.KllHeapDoublesSketch;
-import org.apache.datasketches.kll.KllHelper;
-import org.apache.datasketches.kll.KllPreambleUtil;
 import org.apache.datasketches.quantilescommon.DoublesSortedView;
 import org.apache.datasketches.quantilescommon.DoublesSortedViewIterator;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/kll/KllMiscDirectFloatsTest.java b/src/test/java/org/apache/datasketches/kll/KllMiscDirectFloatsTest.java
index 9c795200b..f4166d652 100644
--- a/src/test/java/org/apache/datasketches/kll/KllMiscDirectFloatsTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllMiscDirectFloatsTest.java
@@ -28,11 +28,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.kll.KllDirectFloatsSketch;
-import org.apache.datasketches.kll.KllFloatsSketch;
-import org.apache.datasketches.kll.KllHeapFloatsSketch;
-import org.apache.datasketches.kll.KllHelper;
-import org.apache.datasketches.kll.KllPreambleUtil;
 import org.apache.datasketches.quantilescommon.FloatsSortedView;
 import org.apache.datasketches.quantilescommon.FloatsSortedViewIterator;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/kll/KllMiscDirectLongsTest.java b/src/test/java/org/apache/datasketches/kll/KllMiscDirectLongsTest.java
index fca3640e2..5f19b3460 100644
--- a/src/test/java/org/apache/datasketches/kll/KllMiscDirectLongsTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllMiscDirectLongsTest.java
@@ -28,11 +28,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.kll.KllDirectLongsSketch;
-import org.apache.datasketches.kll.KllHeapLongsSketch;
-import org.apache.datasketches.kll.KllHelper;
-import org.apache.datasketches.kll.KllLongsSketch;
-import org.apache.datasketches.kll.KllPreambleUtil;
 import org.apache.datasketches.quantilescommon.LongsSortedView;
 import org.apache.datasketches.quantilescommon.LongsSortedViewIterator;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/kll/KllMiscDoublesTest.java b/src/test/java/org/apache/datasketches/kll/KllMiscDoublesTest.java
index daab63288..642e3171a 100644
--- a/src/test/java/org/apache/datasketches/kll/KllMiscDoublesTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllMiscDoublesTest.java
@@ -33,13 +33,6 @@
 import java.util.Arrays;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.kll.KllDirectDoublesSketch;
-import org.apache.datasketches.kll.KllDoublesHelper;
-import org.apache.datasketches.kll.KllDoublesSketch;
-import org.apache.datasketches.kll.KllHeapDoublesSketch;
-import org.apache.datasketches.kll.KllHelper;
-import org.apache.datasketches.kll.KllPreambleUtil;
-import org.apache.datasketches.kll.KllSketch;
 import org.apache.datasketches.quantilescommon.DoublesSortedView;
 import org.apache.datasketches.quantilescommon.DoublesSortedViewIterator;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/kll/KllMiscFloatsTest.java b/src/test/java/org/apache/datasketches/kll/KllMiscFloatsTest.java
index 8a380b28c..b5f2fd822 100644
--- a/src/test/java/org/apache/datasketches/kll/KllMiscFloatsTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllMiscFloatsTest.java
@@ -33,13 +33,6 @@
 import java.util.Arrays;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.kll.KllDirectFloatsSketch;
-import org.apache.datasketches.kll.KllFloatsHelper;
-import org.apache.datasketches.kll.KllFloatsSketch;
-import org.apache.datasketches.kll.KllHeapFloatsSketch;
-import org.apache.datasketches.kll.KllHelper;
-import org.apache.datasketches.kll.KllPreambleUtil;
-import org.apache.datasketches.kll.KllSketch;
 import org.apache.datasketches.quantilescommon.FloatsSortedView;
 import org.apache.datasketches.quantilescommon.FloatsSortedViewIterator;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/kll/KllMiscItemsTest.java b/src/test/java/org/apache/datasketches/kll/KllMiscItemsTest.java
index 72a4acf47..2555b64c2 100644
--- a/src/test/java/org/apache/datasketches/kll/KllMiscItemsTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllMiscItemsTest.java
@@ -37,12 +37,6 @@
 import org.apache.datasketches.common.ArrayOfStringsSerDe;
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.common.Util;
-import org.apache.datasketches.kll.KllDirectCompactItemsSketch;
-import org.apache.datasketches.kll.KllHeapItemsSketch;
-import org.apache.datasketches.kll.KllHelper;
-import org.apache.datasketches.kll.KllItemsHelper;
-import org.apache.datasketches.kll.KllItemsSketch;
-import org.apache.datasketches.kll.KllPreambleUtil;
 import org.apache.datasketches.quantilescommon.GenericSortedViewIterator;
 import org.apache.datasketches.quantilescommon.ItemsSketchSortedView;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/kll/KllMiscLongsTest.java b/src/test/java/org/apache/datasketches/kll/KllMiscLongsTest.java
index 0bf770445..4914656ff 100644
--- a/src/test/java/org/apache/datasketches/kll/KllMiscLongsTest.java
+++ b/src/test/java/org/apache/datasketches/kll/KllMiscLongsTest.java
@@ -33,13 +33,6 @@
 import java.util.Arrays;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.kll.KllDirectLongsSketch;
-import org.apache.datasketches.kll.KllHeapLongsSketch;
-import org.apache.datasketches.kll.KllHelper;
-import org.apache.datasketches.kll.KllLongsHelper;
-import org.apache.datasketches.kll.KllLongsSketch;
-import org.apache.datasketches.kll.KllPreambleUtil;
-import org.apache.datasketches.kll.KllSketch;
 import org.apache.datasketches.kll.KllSketch.SketchStructure;
 import org.apache.datasketches.quantilescommon.LongsSortedView;
 import org.apache.datasketches.quantilescommon.LongsSortedViewIterator;
diff --git a/src/test/java/org/apache/datasketches/quantiles/DirectCompactDoublesSketchTest.java b/src/test/java/org/apache/datasketches/quantiles/DirectCompactDoublesSketchTest.java
index 4e8d405c8..ca4633be9 100644
--- a/src/test/java/org/apache/datasketches/quantiles/DirectCompactDoublesSketchTest.java
+++ b/src/test/java/org/apache/datasketches/quantiles/DirectCompactDoublesSketchTest.java
@@ -29,7 +29,6 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-import org.apache.datasketches.common.MemorySegmentRequest;
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/quantiles/DoublesMiscTest.java b/src/test/java/org/apache/datasketches/quantiles/DoublesMiscTest.java
index 51d062564..19409b424 100644
--- a/src/test/java/org/apache/datasketches/quantiles/DoublesMiscTest.java
+++ b/src/test/java/org/apache/datasketches/quantiles/DoublesMiscTest.java
@@ -19,7 +19,6 @@
 
 package org.apache.datasketches.quantiles;
 
-import static org.apache.datasketches.common.MemorySegmentStatus.isSameResource;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
@@ -28,7 +27,6 @@
 
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.common.SketchesReadOnlyException;
-import org.apache.datasketches.common.SketchesStateException;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -237,7 +235,7 @@ public void wrapUnionFromHeap() {
     s1.update(2);
     final MemorySegment seg = MemorySegment.ofArray(s1.toByteArray(false)).asReadOnly();
     try {
-      final QuantilesDoublesUnion u = QuantilesDoublesUnion.wrap(seg, null);
+      QuantilesDoublesUnion.wrap(seg, null);
     } catch (final SketchesReadOnlyException e) {
       //expected
     }
@@ -258,7 +256,7 @@ public void wrapUnionFromCompact() {
    * println
    * @param o object to print
    */
-  private static void println(final Object o) {
+  static void println(final Object o) {
     //System.out.println(o.toString());
   }
 
diff --git a/src/test/java/org/apache/datasketches/quantilescommon/SortedViewEmptyAccessorTest.java b/src/test/java/org/apache/datasketches/quantilescommon/SortedViewEmptyAccessorTest.java
index e983272d3..5f2abfbd8 100644
--- a/src/test/java/org/apache/datasketches/quantilescommon/SortedViewEmptyAccessorTest.java
+++ b/src/test/java/org/apache/datasketches/quantilescommon/SortedViewEmptyAccessorTest.java
@@ -29,7 +29,7 @@
 public final class SortedViewEmptyAccessorTest {
 
   @Test
-  public void checkFloatsSortedViewEmptyAccessors() {
+  public static void checkFloatsSortedViewEmptyAccessors() {
     final FloatsSketchSortedView sv = new FloatsSketchSortedView(
         new float[] {1F},
         new long[] {1},
@@ -42,7 +42,7 @@ public void checkFloatsSortedViewEmptyAccessors() {
   }
 
   @Test
-  public void checkDoublesSortedViewEmptyAccessors() {
+  public static void checkDoublesSortedViewEmptyAccessors() {
     final DoublesSketchSortedView sv = new DoublesSketchSortedView(
         new double[] {1.0},
         new long[] {1},
@@ -55,7 +55,7 @@ public void checkDoublesSortedViewEmptyAccessors() {
   }
 
   @Test
-  public void checkLongsSortedViewEmptyAccessors() {
+  public static void checkLongsSortedViewEmptyAccessors() {
     final LongsSketchSortedView sv = new LongsSketchSortedView(
         new long[] {1},
         new long[] {1},
@@ -68,7 +68,7 @@ public void checkLongsSortedViewEmptyAccessors() {
   }
 
   @Test
-  public void checkItemsSortedViewEmptyAccessors() {
+  public static void checkItemsSortedViewEmptyAccessors() {
     final ItemsSketchSortedView<String> sv = new ItemsSketchSortedView<>(
         new String[] {"1"},
         new long[] {1},
diff --git a/src/test/java/org/apache/datasketches/req/ReqCompactorTest.java b/src/test/java/org/apache/datasketches/req/ReqCompactorTest.java
index 6c0ec20da..95f35831a 100644
--- a/src/test/java/org/apache/datasketches/req/ReqCompactorTest.java
+++ b/src/test/java/org/apache/datasketches/req/ReqCompactorTest.java
@@ -25,10 +25,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.positional.PositionalSegment;
-import org.apache.datasketches.req.FloatBuffer;
-import org.apache.datasketches.req.ReqCompactor;
-import org.apache.datasketches.req.ReqSerDe;
-import org.apache.datasketches.req.ReqSketch;
 import org.apache.datasketches.req.ReqSerDe.Compactor;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/req/ReqDebugImplTest.java b/src/test/java/org/apache/datasketches/req/ReqDebugImplTest.java
index da19aa9ea..5e757ce0f 100644
--- a/src/test/java/org/apache/datasketches/req/ReqDebugImplTest.java
+++ b/src/test/java/org/apache/datasketches/req/ReqDebugImplTest.java
@@ -21,10 +21,6 @@
 
 import java.util.List;
 
-import org.apache.datasketches.req.ReqCompactor;
-import org.apache.datasketches.req.ReqDebug;
-import org.apache.datasketches.req.ReqSketch;
-
 /**
  * The implementation of the ReqDebug interface. The current levels are
  * implemented:
diff --git a/src/test/java/org/apache/datasketches/req/ReqFloatBufferTest.java b/src/test/java/org/apache/datasketches/req/ReqFloatBufferTest.java
index 7a7f77d05..82f958d0e 100644
--- a/src/test/java/org/apache/datasketches/req/ReqFloatBufferTest.java
+++ b/src/test/java/org/apache/datasketches/req/ReqFloatBufferTest.java
@@ -29,7 +29,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.req.FloatBuffer;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/req/ReqSketchBuilderTest.java b/src/test/java/org/apache/datasketches/req/ReqSketchBuilderTest.java
index e21405f70..8e33b03e2 100644
--- a/src/test/java/org/apache/datasketches/req/ReqSketchBuilderTest.java
+++ b/src/test/java/org/apache/datasketches/req/ReqSketchBuilderTest.java
@@ -22,7 +22,6 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-import org.apache.datasketches.req.ReqSketchBuilder;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/req/ReqSketchSortedViewTest.java b/src/test/java/org/apache/datasketches/req/ReqSketchSortedViewTest.java
index dbd7d9ffe..09c4724e3 100644
--- a/src/test/java/org/apache/datasketches/req/ReqSketchSortedViewTest.java
+++ b/src/test/java/org/apache/datasketches/req/ReqSketchSortedViewTest.java
@@ -21,14 +21,11 @@
 
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.EXCLUSIVE;
 import static org.apache.datasketches.quantilescommon.QuantileSearchCriteria.INCLUSIVE;
-
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
 import org.apache.datasketches.quantilescommon.FloatsSortedView;
 import org.apache.datasketches.quantilescommon.FloatsSortedViewIterator;
-import org.apache.datasketches.req.ReqSketch;
-import org.apache.datasketches.req.ReqSketchBuilder;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/req/ReqSketchTest.java b/src/test/java/org/apache/datasketches/req/ReqSketchTest.java
index 98cece3f9..0499f865a 100644
--- a/src/test/java/org/apache/datasketches/req/ReqSketchTest.java
+++ b/src/test/java/org/apache/datasketches/req/ReqSketchTest.java
@@ -34,8 +34,6 @@
 import org.apache.datasketches.quantilescommon.QuantileSearchCriteria;
 import org.apache.datasketches.quantilescommon.QuantilesFloatsSketchIterator;
 import org.apache.datasketches.quantilescommon.QuantilesUtil;
-import org.apache.datasketches.req.ReqSketch;
-import org.apache.datasketches.req.ReqSketchBuilder;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/sampling/EbppsItemsSampleTest.java b/src/test/java/org/apache/datasketches/sampling/EbppsItemsSampleTest.java
index cdcb022da..0241278e2 100644
--- a/src/test/java/org/apache/datasketches/sampling/EbppsItemsSampleTest.java
+++ b/src/test/java/org/apache/datasketches/sampling/EbppsItemsSampleTest.java
@@ -28,7 +28,6 @@
 import java.util.Arrays;
 import java.util.Random;
 
-import org.apache.datasketches.sampling.EbppsItemsSample;
 import org.testng.annotations.Test;
 
 public class EbppsItemsSampleTest {
diff --git a/src/test/java/org/apache/datasketches/sampling/EbppsItemsSketchTest.java b/src/test/java/org/apache/datasketches/sampling/EbppsItemsSketchTest.java
index 142cfe237..97fdc1601 100644
--- a/src/test/java/org/apache/datasketches/sampling/EbppsItemsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/sampling/EbppsItemsSketchTest.java
@@ -30,8 +30,6 @@
 import org.apache.datasketches.common.ArrayOfLongsSerDe;
 import org.apache.datasketches.common.ArrayOfStringsSerDe;
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.sampling.EbppsItemsSketch;
-import org.apache.datasketches.sampling.PreambleUtil;
 import org.testng.annotations.Test;
 
 public class EbppsItemsSketchTest {
diff --git a/src/test/java/org/apache/datasketches/sampling/ReservoirItemsSketchTest.java b/src/test/java/org/apache/datasketches/sampling/ReservoirItemsSketchTest.java
index 738b46bd0..4dd987b32 100644
--- a/src/test/java/org/apache/datasketches/sampling/ReservoirItemsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/sampling/ReservoirItemsSketchTest.java
@@ -527,6 +527,7 @@ public void checkForceIncrement() {
     }
   }
 
+  @SuppressWarnings("unused")
   @Test
   public void checkEstimateSubsetSum() {
     final int k = 10;
diff --git a/src/test/java/org/apache/datasketches/sampling/ReservoirItemsUnionTest.java b/src/test/java/org/apache/datasketches/sampling/ReservoirItemsUnionTest.java
index b474901a9..702cc97e2 100644
--- a/src/test/java/org/apache/datasketches/sampling/ReservoirItemsUnionTest.java
+++ b/src/test/java/org/apache/datasketches/sampling/ReservoirItemsUnionTest.java
@@ -42,10 +42,6 @@
 import org.apache.datasketches.common.ArrayOfStringsSerDe;
 import org.apache.datasketches.common.Family;
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.sampling.PreambleUtil;
-import org.apache.datasketches.sampling.ReservoirItemsSketch;
-import org.apache.datasketches.sampling.ReservoirItemsUnion;
-import org.apache.datasketches.sampling.ReservoirSize;
 import org.testng.annotations.Test;
 
 // Tests mostly focus on Long since other types are already tested in ReservoirItemsSketchTest.
diff --git a/src/test/java/org/apache/datasketches/sampling/ReservoirLongsSketchTest.java b/src/test/java/org/apache/datasketches/sampling/ReservoirLongsSketchTest.java
index 80c10e91c..07cc44c7a 100644
--- a/src/test/java/org/apache/datasketches/sampling/ReservoirLongsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/sampling/ReservoirLongsSketchTest.java
@@ -41,9 +41,6 @@
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.common.SketchesException;
 import org.apache.datasketches.common.SketchesStateException;
-import org.apache.datasketches.sampling.ReservoirLongsSketch;
-import org.apache.datasketches.sampling.ReservoirSize;
-import org.apache.datasketches.sampling.SampleSubsetSummary;
 import org.testng.annotations.Test;
 
 public class ReservoirLongsSketchTest {
@@ -408,6 +405,7 @@ public void cluster_checkEstimateSubsetSum() {
     }
   }
 
+  @SuppressWarnings("unused")
   public void checkEstimateSubsetSum() {
     final int k = 10;
     final ReservoirLongsSketch sketch = ReservoirLongsSketch.newInstance(k);
diff --git a/src/test/java/org/apache/datasketches/sampling/ReservoirLongsUnionTest.java b/src/test/java/org/apache/datasketches/sampling/ReservoirLongsUnionTest.java
index 5d3ace740..b0a4c0866 100644
--- a/src/test/java/org/apache/datasketches/sampling/ReservoirLongsUnionTest.java
+++ b/src/test/java/org/apache/datasketches/sampling/ReservoirLongsUnionTest.java
@@ -37,10 +37,6 @@
 
 import org.apache.datasketches.common.Family;
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.sampling.PreambleUtil;
-import org.apache.datasketches.sampling.ReservoirLongsSketch;
-import org.apache.datasketches.sampling.ReservoirLongsUnion;
-import org.apache.datasketches.sampling.ReservoirSize;
 import org.testng.annotations.Test;
 
 public class ReservoirLongsUnionTest {
diff --git a/src/test/java/org/apache/datasketches/sampling/ReservoirSizeTest.java b/src/test/java/org/apache/datasketches/sampling/ReservoirSizeTest.java
index db7648721..98dfb8e5e 100644
--- a/src/test/java/org/apache/datasketches/sampling/ReservoirSizeTest.java
+++ b/src/test/java/org/apache/datasketches/sampling/ReservoirSizeTest.java
@@ -24,8 +24,6 @@
 import static org.testng.Assert.fail;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.sampling.ReservoirSize;
-import org.apache.datasketches.sampling.SamplingUtil;
 import org.testng.annotations.Test;
 
 public class ReservoirSizeTest {
diff --git a/src/test/java/org/apache/datasketches/sampling/VarOptCrossLanguageTest.java b/src/test/java/org/apache/datasketches/sampling/VarOptCrossLanguageTest.java
index c8db54da8..169245d4b 100644
--- a/src/test/java/org/apache/datasketches/sampling/VarOptCrossLanguageTest.java
+++ b/src/test/java/org/apache/datasketches/sampling/VarOptCrossLanguageTest.java
@@ -116,6 +116,7 @@ public void deserializeFromCppSketchLongs() throws IOException {
   }
 
   @Test(groups = {CHECK_CPP_FILES})
+  @SuppressWarnings("unused")
   public void deserializeFromCppSketchStringsExact() throws IOException {
     final byte[] bytes = getFileBytes(cppPath, "varopt_sketch_string_exact_cpp.sk");
     final VarOptItemsSketch<String> sk = VarOptItemsSketch.heapify(MemorySegment.ofArray(bytes), new ArrayOfStringsSerDe());
@@ -131,6 +132,7 @@ public void deserializeFromCppSketchStringsExact() throws IOException {
   }
 
   @Test(groups = {CHECK_CPP_FILES})
+  @SuppressWarnings("unused")
   public void deserializeFromCppSketchLongsSampling() throws IOException {
     final byte[] bytes = getFileBytes(cppPath, "varopt_sketch_long_sampling_cpp.sk");
     final VarOptItemsSketch<Long> sk = VarOptItemsSketch.heapify(MemorySegment.ofArray(bytes), new ArrayOfLongsSerDe());
diff --git a/src/test/java/org/apache/datasketches/sampling/VarOptItemsSamplesTest.java b/src/test/java/org/apache/datasketches/sampling/VarOptItemsSamplesTest.java
index fcdd71ce8..036179ff5 100644
--- a/src/test/java/org/apache/datasketches/sampling/VarOptItemsSamplesTest.java
+++ b/src/test/java/org/apache/datasketches/sampling/VarOptItemsSamplesTest.java
@@ -28,8 +28,6 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.apache.datasketches.sampling.VarOptItemsSamples;
-import org.apache.datasketches.sampling.VarOptItemsSketch;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/sampling/VarOptItemsSketchTest.java b/src/test/java/org/apache/datasketches/sampling/VarOptItemsSketchTest.java
index 4a9fa3a63..ddc229b0c 100644
--- a/src/test/java/org/apache/datasketches/sampling/VarOptItemsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/sampling/VarOptItemsSketchTest.java
@@ -37,11 +37,6 @@
 import org.apache.datasketches.common.ResizeFactor;
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.common.SketchesStateException;
-import org.apache.datasketches.sampling.PreambleUtil;
-import org.apache.datasketches.sampling.SampleSubsetSummary;
-import org.apache.datasketches.sampling.SamplingUtil;
-import org.apache.datasketches.sampling.VarOptItemsSamples;
-import org.apache.datasketches.sampling.VarOptItemsSketch;
 import org.testng.annotations.Test;
 
 public class VarOptItemsSketchTest {
@@ -579,6 +574,7 @@ public void checkReset() {
   }
 
   @Test
+  @SuppressWarnings("unused")
   public void checkEstimateSubsetSum() {
     final int k = 10;
     final VarOptItemsSketch<Long> sketch = VarOptItemsSketch.newInstance(k);
diff --git a/src/test/java/org/apache/datasketches/sampling/VarOptItemsUnionTest.java b/src/test/java/org/apache/datasketches/sampling/VarOptItemsUnionTest.java
index 03a0c866b..e91b7959a 100644
--- a/src/test/java/org/apache/datasketches/sampling/VarOptItemsUnionTest.java
+++ b/src/test/java/org/apache/datasketches/sampling/VarOptItemsUnionTest.java
@@ -34,10 +34,6 @@
 import org.apache.datasketches.common.ArrayOfStringsSerDe;
 import org.apache.datasketches.common.Family;
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.sampling.ReservoirItemsSketch;
-import org.apache.datasketches.sampling.VarOptItemsSamples;
-import org.apache.datasketches.sampling.VarOptItemsSketch;
-import org.apache.datasketches.sampling.VarOptItemsUnion;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/theta/BitPackingTest.java b/src/test/java/org/apache/datasketches/theta/BitPackingTest.java
index 35de3e342..c155bef77 100644
--- a/src/test/java/org/apache/datasketches/theta/BitPackingTest.java
+++ b/src/test/java/org/apache/datasketches/theta/BitPackingTest.java
@@ -22,7 +22,6 @@
 import static org.testng.Assert.assertEquals;
 
 import org.apache.datasketches.common.Util;
-import org.apache.datasketches.theta.BitPacking;
 import org.testng.annotations.Test;
 
 public class BitPackingTest {
diff --git a/src/test/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketchTest.java b/src/test/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketchTest.java
index 0e3f4241a..392e05d79 100644
--- a/src/test/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketchTest.java
+++ b/src/test/java/org/apache/datasketches/theta/ConcurrentHeapQuickSelectSketchTest.java
@@ -737,7 +737,7 @@ static void waitForBgPropagationToComplete(final UpdatableThetaSketch shared) {
     }
     final ConcurrentSharedThetaSketch csts = (ConcurrentSharedThetaSketch)shared;
     csts.awaitBgPropagationTermination();
-    ConcurrentPropagationService.resetExecutorService(Thread.currentThread().getId());
+    ConcurrentPropagationService.resetExecutorService(Thread.currentThread().threadId());
     csts.initBgPropagationService();
   }
 
diff --git a/src/test/java/org/apache/datasketches/theta/DirectIntersectionTest.java b/src/test/java/org/apache/datasketches/theta/DirectIntersectionTest.java
index 34403c1d8..8347385ce 100644
--- a/src/test/java/org/apache/datasketches/theta/DirectIntersectionTest.java
+++ b/src/test/java/org/apache/datasketches/theta/DirectIntersectionTest.java
@@ -375,7 +375,6 @@ public void checkOverflow() {
     final int k = 1<<lgK;
     ThetaIntersection inter;
     UpdatableThetaSketch sk1;
-    final double est;
 
     final int reqBytes = getMaxIntersectionBytes(k);
     final byte[] segArr = new byte[reqBytes];
diff --git a/src/test/java/org/apache/datasketches/theta/HeapifyWrapSerVer3Test.java b/src/test/java/org/apache/datasketches/theta/HeapifyWrapSerVer3Test.java
index 5b8a95f68..4d7a5aa1c 100644
--- a/src/test/java/org/apache/datasketches/theta/HeapifyWrapSerVer3Test.java
+++ b/src/test/java/org/apache/datasketches/theta/HeapifyWrapSerVer3Test.java
@@ -28,9 +28,7 @@
 import org.apache.datasketches.common.Util;
 import org.testng.annotations.Test;
 
-@SuppressWarnings("resource")
 public class HeapifyWrapSerVer3Test {
-  private static final short defaultSeedHash = Util.computeSeedHash(Util.DEFAULT_UPDATE_SEED);
 
   //Heapify CompactThetaSketch
 
diff --git a/src/test/java/org/apache/datasketches/theta/IteratorTest.java b/src/test/java/org/apache/datasketches/theta/IteratorTest.java
index 4ce9c8f8b..9d9427c78 100644
--- a/src/test/java/org/apache/datasketches/theta/IteratorTest.java
+++ b/src/test/java/org/apache/datasketches/theta/IteratorTest.java
@@ -22,13 +22,9 @@
 import static org.testng.Assert.assertEquals;
 
 import java.lang.foreign.MemorySegment;
-import org.testng.annotations.Test;
-import org.apache.datasketches.common.Family;
-import org.apache.datasketches.theta.CompactThetaSketch;
-import org.apache.datasketches.theta.HashIterator;
-import org.apache.datasketches.theta.ThetaSketch;
 
-import org.apache.datasketches.theta.UpdatableThetaSketch;
+import org.apache.datasketches.common.Family;
+import org.testng.annotations.Test;
 
 
 /**
diff --git a/src/test/java/org/apache/datasketches/theta/JaccardSimilarityTest.java b/src/test/java/org/apache/datasketches/theta/JaccardSimilarityTest.java
index d25dc37d4..4f84c5382 100644
--- a/src/test/java/org/apache/datasketches/theta/JaccardSimilarityTest.java
+++ b/src/test/java/org/apache/datasketches/theta/JaccardSimilarityTest.java
@@ -24,8 +24,6 @@
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
-import org.apache.datasketches.theta.JaccardSimilarity;
-import org.apache.datasketches.theta.UpdatableThetaSketch;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/theta/SketchMiscTest.java b/src/test/java/org/apache/datasketches/theta/SketchMiscTest.java
index cc896e344..7665da7e0 100644
--- a/src/test/java/org/apache/datasketches/theta/SketchMiscTest.java
+++ b/src/test/java/org/apache/datasketches/theta/SketchMiscTest.java
@@ -45,19 +45,19 @@ private static MemorySegment getCompactSketchMemorySegment(final int k, final in
     return seg;
   }
 
-  private static MemorySegment getMemorySegmentFromCompactSketch(final CompactThetaSketch csk) {
-    final byte[] sk1bytes = csk.toByteArray();
-    final MemorySegment seg = MemorySegment.ofArray(sk1bytes).asReadOnly();
-    return seg;
-  }
-
-  private static CompactThetaSketch getCompactSketch(final int k, final int from, final int to) {
-    final UpdatableThetaSketch sk1 = UpdatableThetaSketch.builder().setNominalEntries(k).build();
-    for (int i=from; i<to; i++) {
-      sk1.update(i);
-    }
-    return sk1.compact(true, null);
-  }
+//  private static MemorySegment getMemorySegmentFromCompactSketch(final CompactThetaSketch csk) {
+//    final byte[] sk1bytes = csk.toByteArray();
+//    final MemorySegment seg = MemorySegment.ofArray(sk1bytes).asReadOnly();
+//    return seg;
+//  }
+//
+//  private static CompactThetaSketch getCompactSketch(final int k, final int from, final int to) {
+//    final UpdatableThetaSketch sk1 = UpdatableThetaSketch.builder().setNominalEntries(k).build();
+//    for (int i=from; i<to; i++) {
+//      sk1.update(i);
+//    }
+//    return sk1.compact(true, null);
+//  }
 
   @Test
   public void checkSketchMethods() {
diff --git a/src/test/java/org/apache/datasketches/thetacommon/BinomialBoundsNTest.java b/src/test/java/org/apache/datasketches/thetacommon/BinomialBoundsNTest.java
index 8fa709074..d3596922f 100644
--- a/src/test/java/org/apache/datasketches/thetacommon/BinomialBoundsNTest.java
+++ b/src/test/java/org/apache/datasketches/thetacommon/BinomialBoundsNTest.java
@@ -23,12 +23,10 @@
 import static org.apache.datasketches.thetacommon.BinomialBoundsN.getLowerBound;
 import static org.apache.datasketches.thetacommon.BinomialBoundsN.getUpperBound;
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
 import static org.testng.Assert.assertThrows;
+import static org.testng.Assert.assertTrue;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.thetacommon.BinomialBoundsN;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInTupleSketchedSetsTest.java b/src/test/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInTupleSketchedSetsTest.java
index 96452c012..ffa4cc0ed 100644
--- a/src/test/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInTupleSketchedSetsTest.java
+++ b/src/test/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInTupleSketchedSetsTest.java
@@ -19,10 +19,12 @@
 
 package org.apache.datasketches.thetacommon;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.theta.UpdatableThetaSketch;
 import org.apache.datasketches.theta.UpdatableThetaSketchBuilder;
-import org.apache.datasketches.thetacommon.BoundsOnRatiosInTupleSketchedSets;
 import org.apache.datasketches.tuple.TupleIntersection;
 import org.apache.datasketches.tuple.TupleSketch;
 import org.apache.datasketches.tuple.UpdatableTupleSketch;
@@ -32,9 +34,6 @@
 import org.apache.datasketches.tuple.adouble.DoubleSummarySetOperations;
 import org.testng.annotations.Test;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
 /**
  * @author Lee Rhodes
  * @author David Cromberge
diff --git a/src/test/java/org/apache/datasketches/thetacommon/ThetaUtilTest.java b/src/test/java/org/apache/datasketches/thetacommon/ThetaUtilTest.java
index 2a7628470..3a4ed9574 100644
--- a/src/test/java/org/apache/datasketches/thetacommon/ThetaUtilTest.java
+++ b/src/test/java/org/apache/datasketches/thetacommon/ThetaUtilTest.java
@@ -20,7 +20,6 @@
 package org.apache.datasketches.thetacommon;
 
 import org.apache.datasketches.quantilescommon.QuantilesUtil;
-import org.apache.datasketches.thetacommon.ThetaUtil;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/tuple/CompactSketchWithDoubleSummaryTest.java b/src/test/java/org/apache/datasketches/tuple/CompactSketchWithDoubleSummaryTest.java
index ab855b583..a9bb78128 100644
--- a/src/test/java/org/apache/datasketches/tuple/CompactSketchWithDoubleSummaryTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/CompactSketchWithDoubleSummaryTest.java
@@ -22,15 +22,10 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.tuple.CompactTupleSketch;
-import org.apache.datasketches.tuple.TupleSketch;
-import org.apache.datasketches.tuple.TupleSketchIterator;
-import org.apache.datasketches.tuple.UpdatableTupleSketch;
-import org.apache.datasketches.tuple.UpdatableTupleSketchBuilder;
 import org.apache.datasketches.tuple.adouble.DoubleSummary;
+import org.apache.datasketches.tuple.adouble.DoubleSummary.Mode;
 import org.apache.datasketches.tuple.adouble.DoubleSummaryDeserializer;
 import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
-import org.apache.datasketches.tuple.adouble.DoubleSummary.Mode;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/tuple/IntegerSummary.java b/src/test/java/org/apache/datasketches/tuple/IntegerSummary.java
index 68c74b0a5..b9b6be2c4 100644
--- a/src/test/java/org/apache/datasketches/tuple/IntegerSummary.java
+++ b/src/test/java/org/apache/datasketches/tuple/IntegerSummary.java
@@ -24,8 +24,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.ByteArrayUtil;
-import org.apache.datasketches.tuple.DeserializeResult;
-import org.apache.datasketches.tuple.UpdatableSummary;
 
 /**
  * Summary for generic tuple sketches of type Integer.
diff --git a/src/test/java/org/apache/datasketches/tuple/IntegerSummaryDeserializer.java b/src/test/java/org/apache/datasketches/tuple/IntegerSummaryDeserializer.java
index 56a222758..e4ec77dab 100644
--- a/src/test/java/org/apache/datasketches/tuple/IntegerSummaryDeserializer.java
+++ b/src/test/java/org/apache/datasketches/tuple/IntegerSummaryDeserializer.java
@@ -21,9 +21,6 @@
 
 import java.lang.foreign.MemorySegment;
 
-import org.apache.datasketches.tuple.DeserializeResult;
-import org.apache.datasketches.tuple.SummaryDeserializer;
-
 public class IntegerSummaryDeserializer implements SummaryDeserializer<IntegerSummary> {
 
   @Override
diff --git a/src/test/java/org/apache/datasketches/tuple/IntegerSummaryFactory.java b/src/test/java/org/apache/datasketches/tuple/IntegerSummaryFactory.java
index 3a61a4aee..cc21ffffd 100644
--- a/src/test/java/org/apache/datasketches/tuple/IntegerSummaryFactory.java
+++ b/src/test/java/org/apache/datasketches/tuple/IntegerSummaryFactory.java
@@ -19,8 +19,6 @@
 
 package org.apache.datasketches.tuple;
 
-import org.apache.datasketches.tuple.SummaryFactory;
-
 /**
  * Factory for IntegerSummary.
  */
diff --git a/src/test/java/org/apache/datasketches/tuple/JaccardSimilarityTest.java b/src/test/java/org/apache/datasketches/tuple/JaccardSimilarityTest.java
index 4b789a5ce..d21623e77 100644
--- a/src/test/java/org/apache/datasketches/tuple/JaccardSimilarityTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/JaccardSimilarityTest.java
@@ -19,15 +19,6 @@
 
 package org.apache.datasketches.tuple;
 
-import org.apache.datasketches.theta.UpdatableThetaSketch;
-import org.apache.datasketches.theta.UpdatableThetaSketchBuilder;
-import org.apache.datasketches.tuple.UpdatableTupleSketch;
-import org.apache.datasketches.tuple.UpdatableTupleSketchBuilder;
-import org.apache.datasketches.tuple.adouble.DoubleSummary;
-import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
-import org.apache.datasketches.tuple.adouble.DoubleSummarySetOperations;
-import org.testng.annotations.Test;
-
 import static org.apache.datasketches.tuple.JaccardSimilarity.dissimilarityTest;
 import static org.apache.datasketches.tuple.JaccardSimilarity.exactlyEqual;
 import static org.apache.datasketches.tuple.JaccardSimilarity.jaccard;
@@ -35,6 +26,13 @@
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+import org.apache.datasketches.theta.UpdatableThetaSketch;
+import org.apache.datasketches.theta.UpdatableThetaSketchBuilder;
+import org.apache.datasketches.tuple.adouble.DoubleSummary;
+import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
+import org.apache.datasketches.tuple.adouble.DoubleSummarySetOperations;
+import org.testng.annotations.Test;
+
 /**
  * @author Lee Rhodes
  * @author David Cromberge
diff --git a/src/test/java/org/apache/datasketches/tuple/MiscTest.java b/src/test/java/org/apache/datasketches/tuple/MiscTest.java
index 431dccd94..8fb24edca 100644
--- a/src/test/java/org/apache/datasketches/tuple/MiscTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/MiscTest.java
@@ -23,12 +23,9 @@
 import static org.testng.Assert.assertTrue;
 
 import org.apache.datasketches.thetacommon.SetOperationCornerCases.CornerCase;
-import org.apache.datasketches.tuple.UpdatableTupleSketch;
-import org.apache.datasketches.tuple.UpdatableTupleSketchBuilder;
-import org.apache.datasketches.tuple.Util;
 import org.apache.datasketches.tuple.adouble.DoubleSummary;
-import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
 import org.apache.datasketches.tuple.adouble.DoubleSummary.Mode;
+import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/tuple/SerializerDeserializerTest.java b/src/test/java/org/apache/datasketches/tuple/SerializerDeserializerTest.java
index 92d18639f..251d622a7 100644
--- a/src/test/java/org/apache/datasketches/tuple/SerializerDeserializerTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/SerializerDeserializerTest.java
@@ -25,7 +25,6 @@
 
 import org.apache.datasketches.common.Family;
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.tuple.SerializerDeserializer;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleAnotBTest.java b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleAnotBTest.java
index c3b701275..1c4f8d310 100644
--- a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleAnotBTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleAnotBTest.java
@@ -27,8 +27,8 @@
 import org.apache.datasketches.theta.ThetaSketch;
 import org.apache.datasketches.theta.UpdatableThetaSketch;
 import org.apache.datasketches.theta.UpdatableThetaSketchBuilder;
-import org.apache.datasketches.tuple.TupleAnotB;
 import org.apache.datasketches.tuple.CompactTupleSketch;
+import org.apache.datasketches.tuple.TupleAnotB;
 import org.apache.datasketches.tuple.TupleSketch;
 import org.apache.datasketches.tuple.TupleSketchIterator;
 import org.apache.datasketches.tuple.UpdatableTupleSketch;
diff --git a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleIntersectionTest.java b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleIntersectionTest.java
index a01690cf4..c05263ddd 100644
--- a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleIntersectionTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleIntersectionTest.java
@@ -31,9 +31,6 @@
 import org.apache.datasketches.tuple.TupleSketchIterator;
 import org.apache.datasketches.tuple.UpdatableTupleSketch;
 import org.apache.datasketches.tuple.UpdatableTupleSketchBuilder;
-import org.apache.datasketches.tuple.adouble.DoubleSummary;
-import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
-import org.apache.datasketches.tuple.adouble.DoubleSummarySetOperations;
 import org.apache.datasketches.tuple.adouble.DoubleSummary.Mode;
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleTest.java b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleTest.java
index 94d25bd7d..6637d4043 100644
--- a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleTest.java
@@ -30,10 +30,6 @@
 import org.apache.datasketches.tuple.TupleSketchIterator;
 import org.apache.datasketches.tuple.UpdatableTupleSketch;
 import org.apache.datasketches.tuple.UpdatableTupleSketchBuilder;
-import org.apache.datasketches.tuple.adouble.DoubleTupleSketch;
-import org.apache.datasketches.tuple.adouble.DoubleSummary;
-import org.apache.datasketches.tuple.adouble.DoubleSummaryDeserializer;
-import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
 import org.apache.datasketches.tuple.adouble.DoubleSummary.Mode;
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleUnionTest.java b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleUnionTest.java
index 08dd421d2..daf6187f9 100644
--- a/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleUnionTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/adouble/AdoubleUnionTest.java
@@ -29,9 +29,6 @@
 import org.apache.datasketches.tuple.TupleUnion;
 import org.apache.datasketches.tuple.UpdatableTupleSketch;
 import org.apache.datasketches.tuple.UpdatableTupleSketchBuilder;
-import org.apache.datasketches.tuple.adouble.DoubleSummary;
-import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
-import org.apache.datasketches.tuple.adouble.DoubleSummarySetOperations;
 import org.apache.datasketches.tuple.adouble.DoubleSummary.Mode;
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/src/test/java/org/apache/datasketches/tuple/adouble/FilterTest.java b/src/test/java/org/apache/datasketches/tuple/adouble/FilterTest.java
index 269583df4..c6939e16b 100644
--- a/src/test/java/org/apache/datasketches/tuple/adouble/FilterTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/adouble/FilterTest.java
@@ -25,12 +25,11 @@
 import org.apache.datasketches.tuple.TupleSketch;
 import org.apache.datasketches.tuple.UpdatableTupleSketch;
 import org.apache.datasketches.tuple.UpdatableTupleSketchBuilder;
-import org.apache.datasketches.tuple.adouble.DoubleSummary;
-import org.apache.datasketches.tuple.adouble.DoubleSummaryFactory;
 import org.apache.datasketches.tuple.adouble.DoubleSummary.Mode;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+@SuppressWarnings("unused")
 public class FilterTest {
     private static final int numberOfElements = 100;
     private static final Random random = new Random(1);//deterministic for this class
diff --git a/src/test/java/org/apache/datasketches/tuple/aninteger/EngagementTest.java b/src/test/java/org/apache/datasketches/tuple/aninteger/EngagementTest.java
index cd2a20ea9..1afb00f67 100644
--- a/src/test/java/org/apache/datasketches/tuple/aninteger/EngagementTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/aninteger/EngagementTest.java
@@ -28,9 +28,6 @@
 import org.apache.datasketches.tuple.CompactTupleSketch;
 import org.apache.datasketches.tuple.TupleSketchIterator;
 import org.apache.datasketches.tuple.TupleUnion;
-import org.apache.datasketches.tuple.aninteger.IntegerTupleSketch;
-import org.apache.datasketches.tuple.aninteger.IntegerSummary;
-import org.apache.datasketches.tuple.aninteger.IntegerSummarySetOperations;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/tuple/aninteger/IntegerSketchTest.java b/src/test/java/org/apache/datasketches/tuple/aninteger/IntegerSketchTest.java
index 8111eb544..d5b23d5cc 100644
--- a/src/test/java/org/apache/datasketches/tuple/aninteger/IntegerSketchTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/aninteger/IntegerSketchTest.java
@@ -23,8 +23,8 @@
 
 import java.lang.foreign.MemorySegment;
 
-import org.apache.datasketches.tuple.TupleAnotB;
 import org.apache.datasketches.tuple.CompactTupleSketch;
+import org.apache.datasketches.tuple.TupleAnotB;
 import org.apache.datasketches.tuple.TupleIntersection;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/tuple/aninteger/MikhailsBugTupleTest.java b/src/test/java/org/apache/datasketches/tuple/aninteger/MikhailsBugTupleTest.java
index 5e08748a2..060d8f378 100644
--- a/src/test/java/org/apache/datasketches/tuple/aninteger/MikhailsBugTupleTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/aninteger/MikhailsBugTupleTest.java
@@ -20,8 +20,8 @@
 package org.apache.datasketches.tuple.aninteger;
 
 import org.apache.datasketches.tuple.CompactTupleSketch;
-import org.apache.datasketches.tuple.TupleIntersection;
 import org.apache.datasketches.tuple.TupleAnotB;
+import org.apache.datasketches.tuple.TupleIntersection;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/tuple/aninteger/ParameterLeakageTest.java b/src/test/java/org/apache/datasketches/tuple/aninteger/ParameterLeakageTest.java
index 988d188dd..85ca496ee 100644
--- a/src/test/java/org/apache/datasketches/tuple/aninteger/ParameterLeakageTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/aninteger/ParameterLeakageTest.java
@@ -23,8 +23,8 @@
 import static org.apache.datasketches.tuple.aninteger.IntegerSummary.Mode.Sum;
 
 import org.apache.datasketches.tuple.CompactTupleSketch;
-import org.apache.datasketches.tuple.TupleIntersection;
 import org.apache.datasketches.tuple.TupleAnotB;
+import org.apache.datasketches.tuple.TupleIntersection;
 import org.apache.datasketches.tuple.TupleSketch;
 import org.apache.datasketches.tuple.TupleSketchIterator;
 import org.apache.datasketches.tuple.TupleUnion;
diff --git a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesAnotBTest.java b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesAnotBTest.java
index 48f60cdcc..60dad7dec 100644
--- a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesAnotBTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesAnotBTest.java
@@ -25,13 +25,6 @@
 
 import org.apache.datasketches.common.ResizeFactor;
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesAnotB;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesCompactSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSetOperationBuilder;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketchIterator;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketchBuilder;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesCompactSketchTest.java b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesCompactSketchTest.java
index 7bd2ee14b..dbf5fc026 100644
--- a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesCompactSketchTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesCompactSketchTest.java
@@ -24,14 +24,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.Util;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesCompactSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketchBuilder;
-import org.apache.datasketches.tuple.arrayofdoubles.DirectArrayOfDoublesCompactSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.DirectArrayOfDoublesQuickSelectSketchR;
-import org.apache.datasketches.tuple.arrayofdoubles.HeapArrayOfDoublesCompactSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.HeapArrayOfDoublesQuickSelectSketch;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesIntersectionTest.java b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesIntersectionTest.java
index 6a54adbdd..f30c92bb5 100644
--- a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesIntersectionTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesIntersectionTest.java
@@ -24,12 +24,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesCombiner;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesCompactSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesIntersection;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSetOperationBuilder;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketchBuilder;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesQuickSelectSketchTest.java b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesQuickSelectSketchTest.java
index a54c12d20..1f13c9ee0 100644
--- a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesQuickSelectSketchTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesQuickSelectSketchTest.java
@@ -22,9 +22,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesQuickSelectSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketchBuilder;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUnionTest.java b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUnionTest.java
index 3ba169673..d9b02f768 100644
--- a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUnionTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUnionTest.java
@@ -23,13 +23,6 @@
 import java.util.Arrays;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesCompactSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSetOperationBuilder;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketchIterator;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUnion;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketchBuilder;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesCompactSketchTest.java b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesCompactSketchTest.java
index 229e44e52..19b45edd4 100644
--- a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesCompactSketchTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesCompactSketchTest.java
@@ -23,11 +23,6 @@
 
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.common.Util;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesCompactSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketchIterator;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketchBuilder;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesQuickSelectSketchTest.java b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesQuickSelectSketchTest.java
index 781f3893b..f9783a58b 100644
--- a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesQuickSelectSketchTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesQuickSelectSketchTest.java
@@ -24,11 +24,6 @@
 
 import org.apache.datasketches.common.ResizeFactor;
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketchIterator;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketchBuilder;
-import org.apache.datasketches.tuple.arrayofdoubles.DirectArrayOfDoublesQuickSelectSketch;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesCompactSketchTest.java b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesCompactSketchTest.java
index 69228c515..7c8c038cf 100644
--- a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesCompactSketchTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesCompactSketchTest.java
@@ -22,11 +22,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesCompactSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketchIterator;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketchBuilder;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesQuickSelectSketchTest.java b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesQuickSelectSketchTest.java
index 9fe991b36..9c31e88e7 100644
--- a/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesQuickSelectSketchTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesQuickSelectSketchTest.java
@@ -22,10 +22,6 @@
 import java.lang.foreign.MemorySegment;
 
 import org.apache.datasketches.common.ResizeFactor;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesSketchIterator;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketch;
-import org.apache.datasketches.tuple.arrayofdoubles.ArrayOfDoublesUpdatableSketchBuilder;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/org/apache/datasketches/tuple/strings/ArrayOfStringsSketchTest.java b/src/test/java/org/apache/datasketches/tuple/strings/ArrayOfStringsSketchTest.java
index b9aaf576e..e2f4b7940 100644
--- a/src/test/java/org/apache/datasketches/tuple/strings/ArrayOfStringsSketchTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/strings/ArrayOfStringsSketchTest.java
@@ -24,14 +24,11 @@
 
 import java.lang.foreign.MemorySegment;
 
-import org.apache.datasketches.tuple.TupleAnotB;
 import org.apache.datasketches.tuple.CompactTupleSketch;
+import org.apache.datasketches.tuple.TupleAnotB;
 import org.apache.datasketches.tuple.TupleIntersection;
 import org.apache.datasketches.tuple.TupleSketchIterator;
 import org.apache.datasketches.tuple.TupleUnion;
-import org.apache.datasketches.tuple.strings.ArrayOfStringsTupleSketch;
-import org.apache.datasketches.tuple.strings.ArrayOfStringsSummary;
-import org.apache.datasketches.tuple.strings.ArrayOfStringsSummarySetOperations;
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/org/apache/datasketches/tuple/strings/ArrayOfStringsSummaryTest.java b/src/test/java/org/apache/datasketches/tuple/strings/ArrayOfStringsSummaryTest.java
index 1b1d94bed..65ca2f085 100644
--- a/src/test/java/org/apache/datasketches/tuple/strings/ArrayOfStringsSummaryTest.java
+++ b/src/test/java/org/apache/datasketches/tuple/strings/ArrayOfStringsSummaryTest.java
@@ -25,11 +25,9 @@
 
 import java.lang.foreign.MemorySegment;
 
-import org.testng.annotations.Test;
 import org.apache.datasketches.common.SketchesArgumentException;
 import org.apache.datasketches.tuple.DeserializeResult;
-import org.apache.datasketches.tuple.strings.ArrayOfStringsSummary;
-import org.apache.datasketches.tuple.strings.ArrayOfStringsSummaryDeserializer;
+import org.testng.annotations.Test;
 
 /**
  * @author Lee Rhodes