diff --git a/jctools-benchmarks/src/main/java/org/jctools/jmh/throughput/channels/SpscChannelThroughputTest.java b/jctools-benchmarks/src/main/java/org/jctools/jmh/throughput/channels/SpscChannelThroughputTest.java
index bc0aa67e..b86b1363 100644
--- a/jctools-benchmarks/src/main/java/org/jctools/jmh/throughput/channels/SpscChannelThroughputTest.java
+++ b/jctools-benchmarks/src/main/java/org/jctools/jmh/throughput/channels/SpscChannelThroughputTest.java
@@ -13,11 +13,11 @@
  */
 package org.jctools.jmh.throughput.channels;
 
-import org.jctools.channels.Channel;
-import org.jctools.channels.ChannelConsumer;
-import org.jctools.channels.ChannelProducer;
-import org.jctools.channels.ChannelReceiver;
+import org.jctools.channels.*;
 import org.jctools.channels.spsc.SpscChannel;
+import org.jctools.util.PortableJvmInfo;
+import org.jctools.util.Pow2;
+import org.jctools.util.UnsafeDirectByteBuffer;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 import org.openjdk.jmh.infra.Control;
@@ -37,8 +37,9 @@
 @BenchmarkMode(Mode.Throughput)
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
 @Threads(2)
+@Fork(1)
 @Warmup(iterations = 10, time = 1, timeUnit = TimeUnit.SECONDS)
-@Measurement(iterations = 5, time = 5, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 10, time = 1, timeUnit = TimeUnit.SECONDS)
 public class SpscChannelThroughputTest {
 
 	@Param({"32000"})
@@ -61,7 +62,8 @@ public void accept(Ping element) {
                 blackhole.consume(element.getValue());
             }
         };
-        buffer = ByteBuffer.allocateDirect(capacity*(8+1)*3);
+        int requiredBufferSize = OffHeapFixedMessageSizeRingBuffer.getRequiredBufferSize(capacity, PortableJvmInfo.CACHE_LINE_SIZE);
+        buffer = UnsafeDirectByteBuffer.allocateAlignedByteBuffer(requiredBufferSize, PortableJvmInfo.CACHE_LINE_SIZE);
         channel = new SpscChannel<Ping>(buffer, capacity, Ping.class);
         producer = channel.producer();
         consumer = channel.consumer(receiver);
diff --git a/jctools-core/src/test/java/org/jctools/maps/KeyAtomicityTest.java b/jctools-core/src/test/java/org/jctools/maps/KeyAtomicityTest.java
index a5f136a8..f0186318 100644
--- a/jctools-core/src/test/java/org/jctools/maps/KeyAtomicityTest.java
+++ b/jctools-core/src/test/java/org/jctools/maps/KeyAtomicityTest.java
@@ -1,11 +1,11 @@
 package org.jctools.maps;
 
-import org.junit.Test;
-
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 
 public class KeyAtomicityTest
diff --git a/jctools-core/src/test/java/org/jctools/maps/NonBlockingHashMapTest.java b/jctools-core/src/test/java/org/jctools/maps/NonBlockingHashMapTest.java
index a643b076..9fe88f41 100644
--- a/jctools-core/src/test/java/org/jctools/maps/NonBlockingHashMapTest.java
+++ b/jctools-core/src/test/java/org/jctools/maps/NonBlockingHashMapTest.java
@@ -1,19 +1,20 @@
 package org.jctools.maps;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 import com.google.common.collect.testing.*;
 import com.google.common.collect.testing.features.CollectionFeature;
 import com.google.common.collect.testing.features.CollectionSize;
 import com.google.common.collect.testing.features.MapFeature;
 import com.google.common.collect.testing.testers.MapReplaceEntryTester;
 import com.google.common.collect.testing.testers.MapReplaceTester;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 /**
  * @author Tolstopyatov Vsevolod
  * @since 04/06/17
diff --git a/jctools-core/src/test/java/org/jctools/maps/nbhm_test/NBHMID_Tester2.java b/jctools-core/src/test/java/org/jctools/maps/nbhm_test/NBHMID_Tester2.java
index 0fabdd35..02d01a48 100644
--- a/jctools-core/src/test/java/org/jctools/maps/nbhm_test/NBHMID_Tester2.java
+++ b/jctools-core/src/test/java/org/jctools/maps/nbhm_test/NBHMID_Tester2.java
@@ -13,14 +13,15 @@
  */
 package org.jctools.maps.nbhm_test;
 
-import org.jctools.maps.NonBlockingIdentityHashMap;
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import org.jctools.maps.NonBlockingIdentityHashMap;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
diff --git a/jctools-core/src/test/java/org/jctools/maps/nbhm_test/NBHML_Tester2.java b/jctools-core/src/test/java/org/jctools/maps/nbhm_test/NBHML_Tester2.java
index dc1345e6..518ef3ad 100644
--- a/jctools-core/src/test/java/org/jctools/maps/nbhm_test/NBHML_Tester2.java
+++ b/jctools-core/src/test/java/org/jctools/maps/nbhm_test/NBHML_Tester2.java
@@ -13,14 +13,15 @@
  */
 package org.jctools.maps.nbhm_test;
 
-import org.jctools.maps.NonBlockingHashMapLong;
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import org.jctools.maps.NonBlockingHashMapLong;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
diff --git a/jctools-core/src/test/java/org/jctools/maps/nbhm_test/NBHM_Tester2.java b/jctools-core/src/test/java/org/jctools/maps/nbhm_test/NBHM_Tester2.java
index 82c0d4b7..922d60fc 100644
--- a/jctools-core/src/test/java/org/jctools/maps/nbhm_test/NBHM_Tester2.java
+++ b/jctools-core/src/test/java/org/jctools/maps/nbhm_test/NBHM_Tester2.java
@@ -13,14 +13,15 @@
  */
 package org.jctools.maps.nbhm_test;
 
-import org.jctools.maps.NonBlockingHashMap;
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
+import org.jctools.maps.NonBlockingHashMap;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
diff --git a/jctools-core/src/test/java/org/jctools/maps/nbhs_test/nbhs_tester.java b/jctools-core/src/test/java/org/jctools/maps/nbhs_test/nbhs_tester.java
index f277747b..08a4654f 100644
--- a/jctools-core/src/test/java/org/jctools/maps/nbhs_test/nbhs_tester.java
+++ b/jctools-core/src/test/java/org/jctools/maps/nbhs_test/nbhs_tester.java
@@ -1,12 +1,13 @@
 package org.jctools.maps.nbhs_test;
 
-import org.jctools.maps.NonBlockingHashSet;
+import java.io.*;
+import java.util.Iterator;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.*;
-import java.util.Iterator;
+import org.jctools.maps.NonBlockingHashSet;
 
 import static org.hamcrest.CoreMatchers.anyOf;
 import static org.hamcrest.CoreMatchers.is;
diff --git a/jctools-core/src/test/java/org/jctools/maps/nbhs_test/nbsi_tester.java b/jctools-core/src/test/java/org/jctools/maps/nbhs_test/nbsi_tester.java
index 45553bb0..2f5a3caf 100644
--- a/jctools-core/src/test/java/org/jctools/maps/nbhs_test/nbsi_tester.java
+++ b/jctools-core/src/test/java/org/jctools/maps/nbhs_test/nbsi_tester.java
@@ -1,12 +1,13 @@
 package org.jctools.maps.nbhs_test;
 
-import org.jctools.maps.NonBlockingSetInt;
+import java.io.*;
+import java.util.Iterator;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.*;
-import java.util.Iterator;
+import org.jctools.maps.NonBlockingSetInt;
 
 import static org.hamcrest.CoreMatchers.anyOf;
 import static org.hamcrest.CoreMatchers.is;
diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTest.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTest.java
index 812eafdc..c13b0efd 100644
--- a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTest.java
+++ b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTest.java
@@ -1,19 +1,18 @@
 package org.jctools.queues;
 
+import java.util.Queue;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.junit.After;
+import org.junit.Test;
+
 import org.jctools.queues.atomic.AtomicQueueFactory;
 import org.jctools.queues.spec.ConcurrentQueueSpec;
 import org.jctools.queues.spec.Ordering;
 import org.jctools.queues.spec.Preference;
 import org.jctools.util.Pow2;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Queue;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.*;
 import static org.junit.Assume.assumeThat;
 
diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpmcArray.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpmcArray.java
index 03926d7a..a7d3ad8b 100644
--- a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpmcArray.java
+++ b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpmcArray.java
@@ -1,12 +1,13 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestMpmcArray extends MpqSanityTest
diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscArray.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscArray.java
index 21fde882..dc10672e 100644
--- a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscArray.java
+++ b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscArray.java
@@ -1,12 +1,13 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestMpscArray extends MpqSanityTest
diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscChunked.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscChunked.java
index c26bd369..73fde6f6 100644
--- a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscChunked.java
+++ b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscChunked.java
@@ -1,13 +1,14 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestMpscChunked extends MpqSanityTest
diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscCompound.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscCompound.java
index 2dc2a5d4..75b8d0c5 100644
--- a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscCompound.java
+++ b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscCompound.java
@@ -1,14 +1,14 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.jctools.util.Pow2;
-import org.junit.Ignore;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+import org.jctools.util.Pow2;
 
 import static org.jctools.util.PortableJvmInfo.CPUs;
 
diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscGrowable.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscGrowable.java
index c1faa1a3..8d16c648 100644
--- a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscGrowable.java
+++ b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscGrowable.java
@@ -1,12 +1,13 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestMpscGrowable extends MpqSanityTest
diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscLinked.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscLinked.java
index de58ba63..a47512c1 100644
--- a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscLinked.java
+++ b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscLinked.java
@@ -1,12 +1,13 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestMpscLinked extends MpqSanityTest
diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscUnbounded.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscUnbounded.java
index 326cec75..903d776d 100644
--- a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscUnbounded.java
+++ b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestMpscUnbounded.java
@@ -1,12 +1,13 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestMpscUnbounded extends MpqSanityTest
diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpmcArray.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpmcArray.java
index 815435f4..dff0000e 100644
--- a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpmcArray.java
+++ b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpmcArray.java
@@ -1,12 +1,13 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestSpmcArray extends MpqSanityTest
diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscArray.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscArray.java
index 8558dce3..3d9d826c 100644
--- a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscArray.java
+++ b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscArray.java
@@ -1,12 +1,13 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestSpscArray extends MpqSanityTest
diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscChunked.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscChunked.java
index b662f4fe..9daba48d 100644
--- a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscChunked.java
+++ b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscChunked.java
@@ -1,13 +1,14 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestSpscChunked extends MpqSanityTest
diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscGrowable.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscGrowable.java
index 7615c3d2..3b872e74 100644
--- a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscGrowable.java
+++ b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscGrowable.java
@@ -1,12 +1,13 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestSpscGrowable extends MpqSanityTest
diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscLinked.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscLinked.java
index b121f416..7be7d8c0 100644
--- a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscLinked.java
+++ b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscLinked.java
@@ -1,12 +1,13 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestSpscLinked extends MpqSanityTest
diff --git a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscUnbounded.java b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscUnbounded.java
index ca256610..f5d237b8 100644
--- a/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscUnbounded.java
+++ b/jctools-core/src/test/java/org/jctools/queues/MpqSanityTestSpscUnbounded.java
@@ -1,12 +1,13 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class MpqSanityTestSpscUnbounded extends MpqSanityTest
diff --git a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTest.java b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTest.java
index deff62ae..8a52148d 100644
--- a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTest.java
+++ b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTest.java
@@ -1,16 +1,16 @@
 package org.jctools.queues;
 
+import java.util.Queue;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.junit.After;
+import org.junit.Test;
+
 import org.jctools.queues.atomic.AtomicQueueFactory;
 import org.jctools.queues.spec.ConcurrentQueueSpec;
 import org.jctools.queues.spec.Ordering;
 import org.jctools.queues.spec.Preference;
 import org.jctools.util.Pow2;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Queue;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.hamcrest.Matchers.*;
 import static org.jctools.queues.matchers.Matchers.emptyAndZeroSize;
diff --git a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpmcArray.java b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpmcArray.java
index 6a873b9c..9b6c4e11 100644
--- a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpmcArray.java
+++ b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpmcArray.java
@@ -1,16 +1,17 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 import static org.junit.Assert.assertEquals;
 
 @RunWith(Parameterized.class)
diff --git a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscArray.java b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscArray.java
index d36ba4c2..89024adb 100644
--- a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscArray.java
+++ b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscArray.java
@@ -1,16 +1,17 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 import static org.junit.Assert.assertEquals;
 
 @RunWith(Parameterized.class)
diff --git a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscArrayExtended.java b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscArrayExtended.java
index 0a6312a3..353dcc99 100644
--- a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscArrayExtended.java
+++ b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscArrayExtended.java
@@ -1,18 +1,12 @@
 package org.jctools.queues;
 
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Queue;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 
 import org.jctools.queues.QueueSanityTest.Val;
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscBlockingConsumerArray.java b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscBlockingConsumerArray.java
index d6ed8e4f..3c69175d 100644
--- a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscBlockingConsumerArray.java
+++ b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscBlockingConsumerArray.java
@@ -1,21 +1,15 @@
 package org.jctools.queues;
 
-import java.lang.Thread.State;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
 import org.jctools.queues.spec.ConcurrentQueueSpec;
 import org.jctools.queues.spec.Ordering;
 
-import static org.junit.Assert.*;
-
 @RunWith(Parameterized.class)
 public class QueueSanityTestMpscBlockingConsumerArray extends QueueSanityTest
 {
diff --git a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscChunked.java b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscChunked.java
index 087074ac..88dcfffc 100644
--- a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscChunked.java
+++ b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscChunked.java
@@ -1,14 +1,15 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 public class QueueSanityTestMpscChunked extends QueueSanityTestMpscArray
 {
diff --git a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscChunkedExtended.java b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscChunkedExtended.java
index c260070f..f882634e 100644
--- a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscChunkedExtended.java
+++ b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscChunkedExtended.java
@@ -1,16 +1,7 @@
 package org.jctools.queues;
 
-import java.util.ArrayList;
-import java.util.Collection;
-
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
 
-@RunWith(Parameterized.class)
 public class QueueSanityTestMpscChunkedExtended
 {
     @Test
diff --git a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscCompound.java b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscCompound.java
index f937f1c9..126ddc63 100644
--- a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscCompound.java
+++ b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscCompound.java
@@ -1,19 +1,17 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.jctools.util.Pow2;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
-import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+import org.jctools.util.Pow2;
 
 import static org.jctools.util.PortableJvmInfo.CPUs;
-import static org.junit.Assert.assertEquals;
 
 @RunWith(Parameterized.class)
 public class QueueSanityTestMpscCompound extends QueueSanityTest
diff --git a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscGrowable.java b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscGrowable.java
index 3d57a7aa..8ad0da33 100644
--- a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscGrowable.java
+++ b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscGrowable.java
@@ -1,14 +1,15 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 public class QueueSanityTestMpscGrowable extends QueueSanityTestMpscArray
 {
diff --git a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscLinked.java b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscLinked.java
index d1abe902..a7e896a6 100644
--- a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscLinked.java
+++ b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscLinked.java
@@ -1,14 +1,15 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 public class QueueSanityTestMpscLinked extends QueueSanityTest
 {
diff --git a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscOfferBelowThreshold.java b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscOfferBelowThreshold.java
index bef4f39e..db7dfa0f 100644
--- a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscOfferBelowThreshold.java
+++ b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscOfferBelowThreshold.java
@@ -1,14 +1,15 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Queue;
+
 import org.junit.Ignore;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Queue;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 @RunWith(Parameterized.class)
 public class QueueSanityTestMpscOfferBelowThreshold extends QueueSanityTest
diff --git a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscUnboundedArray.java b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscUnboundedArray.java
index 2e0e035b..bf81e5f9 100644
--- a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscUnboundedArray.java
+++ b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestMpscUnboundedArray.java
@@ -1,14 +1,15 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 public class QueueSanityTestMpscUnboundedArray extends QueueSanityTest
 {
diff --git a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpmcArray.java b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpmcArray.java
index a7764640..e1670fc8 100644
--- a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpmcArray.java
+++ b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpmcArray.java
@@ -1,14 +1,15 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 public class QueueSanityTestSpmcArray extends QueueSanityTest
 {
diff --git a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpscArray.java b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpscArray.java
index 81ee6f12..7a72e4bc 100644
--- a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpscArray.java
+++ b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpscArray.java
@@ -1,14 +1,15 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 public class QueueSanityTestSpscArray extends QueueSanityTest
 {
diff --git a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpscChunked.java b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpscChunked.java
index a54e29c7..5356ea6e 100644
--- a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpscChunked.java
+++ b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpscChunked.java
@@ -1,15 +1,15 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 public class QueueSanityTestSpscChunked extends QueueSanityTest
 {
diff --git a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpscGrowable.java b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpscGrowable.java
index 2bf62382..7235a773 100644
--- a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpscGrowable.java
+++ b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpscGrowable.java
@@ -1,15 +1,16 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Queue;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Queue;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
 
 import static org.hamcrest.Matchers.is;
 
diff --git a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpscLinked.java b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpscLinked.java
index f01e43d1..ddaafd0a 100644
--- a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpscLinked.java
+++ b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpscLinked.java
@@ -1,14 +1,15 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 public class QueueSanityTestSpscLinked extends QueueSanityTest
 {
diff --git a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpscUnbounded.java b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpscUnbounded.java
index 6274afb7..bc36d7bd 100644
--- a/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpscUnbounded.java
+++ b/jctools-core/src/test/java/org/jctools/queues/QueueSanityTestSpscUnbounded.java
@@ -1,14 +1,15 @@
 package org.jctools.queues;
 
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 public class QueueSanityTestSpscUnbounded extends QueueSanityTest
 {
diff --git a/jctools-core/src/test/java/org/jctools/queues/ScQueueRemoveTest.java b/jctools-core/src/test/java/org/jctools/queues/ScQueueRemoveTest.java
index 8df9dbd8..52709e88 100644
--- a/jctools-core/src/test/java/org/jctools/queues/ScQueueRemoveTest.java
+++ b/jctools-core/src/test/java/org/jctools/queues/ScQueueRemoveTest.java
@@ -1,12 +1,12 @@
 package org.jctools.queues;
 
-import org.junit.Test;
-
 import java.util.Queue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.LockSupport;
 
+import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public abstract class ScQueueRemoveTest
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpmcArray.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpmcArray.java
index 73fb1548..7b7ff1a4 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpmcArray.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpmcArray.java
@@ -1,14 +1,15 @@
 package org.jctools.queues.atomic;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import org.jctools.queues.MessagePassingQueue;
 import org.jctools.queues.MpqSanityTestMpmcArray;
 import org.jctools.queues.spec.ConcurrentQueueSpec;
 import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.ArrayList;
-import java.util.Collection;
 
 @RunWith(Parameterized.class)
 public class AtomicMpqSanityTestMpmcArray extends MpqSanityTestMpmcArray
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscArray.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscArray.java
index e0be2bd0..b777d904 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscArray.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscArray.java
@@ -1,15 +1,15 @@
 package org.jctools.queues.atomic;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import org.jctools.queues.MessagePassingQueue;
-import org.jctools.queues.MpqSanityTest;
 import org.jctools.queues.MpqSanityTestMpscArray;
 import org.jctools.queues.spec.ConcurrentQueueSpec;
 import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.ArrayList;
-import java.util.Collection;
 
 @RunWith(Parameterized.class)
 public class AtomicMpqSanityTestMpscArray extends MpqSanityTestMpscArray
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscChunked.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscChunked.java
index 440bc3cd..c6eac648 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscChunked.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscChunked.java
@@ -1,17 +1,16 @@
 package org.jctools.queues.atomic;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import org.jctools.queues.MessagePassingQueue;
-import org.jctools.queues.MpqSanityTest;
 import org.jctools.queues.MpqSanityTestMpscChunked;
 import org.jctools.queues.MpscChunkedArrayQueue;
 import org.jctools.queues.spec.ConcurrentQueueSpec;
 import org.jctools.queues.spec.Ordering;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.ArrayList;
-import java.util.Collection;
 
 @RunWith(Parameterized.class)
 public class AtomicMpqSanityTestMpscChunked extends MpqSanityTestMpscChunked
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscCompound.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscCompound.java
index 128baa1f..f2e31503 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscCompound.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscCompound.java
@@ -1,16 +1,16 @@
 package org.jctools.queues.atomic;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import org.jctools.queues.MessagePassingQueue;
-import org.jctools.queues.MpqSanityTest;
 import org.jctools.queues.MpqSanityTestMpscCompound;
 import org.jctools.queues.spec.ConcurrentQueueSpec;
 import org.jctools.queues.spec.Ordering;
 import org.jctools.util.Pow2;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.ArrayList;
-import java.util.Collection;
 
 import static org.jctools.util.PortableJvmInfo.CPUs;
 
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscGrowable.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscGrowable.java
index 5b5c71a0..e5006f21 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscGrowable.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscGrowable.java
@@ -1,16 +1,16 @@
 package org.jctools.queues.atomic;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import org.jctools.queues.MessagePassingQueue;
-import org.jctools.queues.MpqSanityTest;
 import org.jctools.queues.MpqSanityTestMpscGrowable;
 import org.jctools.queues.MpscGrowableArrayQueue;
 import org.jctools.queues.spec.ConcurrentQueueSpec;
 import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.ArrayList;
-import java.util.Collection;
 
 @RunWith(Parameterized.class)
 public class AtomicMpqSanityTestMpscGrowable extends MpqSanityTestMpscGrowable
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscLinked.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscLinked.java
index 038e91d0..3df8b1cd 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscLinked.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscLinked.java
@@ -1,15 +1,15 @@
 package org.jctools.queues.atomic;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import org.jctools.queues.MessagePassingQueue;
-import org.jctools.queues.MpqSanityTest;
 import org.jctools.queues.MpqSanityTestMpscLinked;
 import org.jctools.queues.spec.ConcurrentQueueSpec;
 import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.ArrayList;
-import java.util.Collection;
 
 @RunWith(Parameterized.class)
 public class AtomicMpqSanityTestMpscLinked extends MpqSanityTestMpscLinked
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscUnbounded.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscUnbounded.java
index dda25e65..b8bfd4b8 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscUnbounded.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestMpscUnbounded.java
@@ -1,16 +1,16 @@
 package org.jctools.queues.atomic;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import org.jctools.queues.MessagePassingQueue;
-import org.jctools.queues.MpqSanityTest;
 import org.jctools.queues.MpqSanityTestMpscUnbounded;
 import org.jctools.queues.MpscUnboundedArrayQueue;
 import org.jctools.queues.spec.ConcurrentQueueSpec;
 import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.ArrayList;
-import java.util.Collection;
 
 @RunWith(Parameterized.class)
 public class AtomicMpqSanityTestMpscUnbounded extends MpqSanityTestMpscUnbounded
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpmcArray.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpmcArray.java
index c25963c8..258ba508 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpmcArray.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpmcArray.java
@@ -1,15 +1,15 @@
 package org.jctools.queues.atomic;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import org.jctools.queues.MessagePassingQueue;
-import org.jctools.queues.MpqSanityTest;
 import org.jctools.queues.MpqSanityTestSpmcArray;
 import org.jctools.queues.spec.ConcurrentQueueSpec;
 import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.ArrayList;
-import java.util.Collection;
 
 @RunWith(Parameterized.class)
 public class AtomicMpqSanityTestSpmcArray extends MpqSanityTestSpmcArray
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpscArray.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpscArray.java
index 71091756..c2fe105a 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpscArray.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpscArray.java
@@ -1,15 +1,15 @@
 package org.jctools.queues.atomic;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import org.jctools.queues.MessagePassingQueue;
-import org.jctools.queues.MpqSanityTest;
 import org.jctools.queues.MpqSanityTestSpscArray;
 import org.jctools.queues.spec.ConcurrentQueueSpec;
 import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.ArrayList;
-import java.util.Collection;
 
 @RunWith(Parameterized.class)
 public class AtomicMpqSanityTestSpscArray extends MpqSanityTestSpscArray
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpscChunked.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpscChunked.java
index 948c8fca..ba4e9068 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpscChunked.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpscChunked.java
@@ -1,17 +1,16 @@
 package org.jctools.queues.atomic;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import org.jctools.queues.MessagePassingQueue;
-import org.jctools.queues.MpqSanityTest;
 import org.jctools.queues.MpqSanityTestSpscChunked;
 import org.jctools.queues.SpscChunkedArrayQueue;
 import org.jctools.queues.spec.ConcurrentQueueSpec;
 import org.jctools.queues.spec.Ordering;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.ArrayList;
-import java.util.Collection;
 
 @RunWith(Parameterized.class)
 public class AtomicMpqSanityTestSpscChunked extends MpqSanityTestSpscChunked
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpscGrowable.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpscGrowable.java
index e05bfddd..8b43a65f 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpscGrowable.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpscGrowable.java
@@ -1,16 +1,16 @@
 package org.jctools.queues.atomic;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import org.jctools.queues.MessagePassingQueue;
-import org.jctools.queues.MpqSanityTest;
 import org.jctools.queues.MpqSanityTestSpscGrowable;
 import org.jctools.queues.SpscGrowableArrayQueue;
 import org.jctools.queues.spec.ConcurrentQueueSpec;
 import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.ArrayList;
-import java.util.Collection;
 
 @RunWith(Parameterized.class)
 public class AtomicMpqSanityTestSpscGrowable extends MpqSanityTestSpscGrowable
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpscLinked.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpscLinked.java
index d68380b7..24811d4a 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpscLinked.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpscLinked.java
@@ -1,15 +1,15 @@
 package org.jctools.queues.atomic;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import org.jctools.queues.MessagePassingQueue;
-import org.jctools.queues.MpqSanityTest;
 import org.jctools.queues.MpqSanityTestSpscLinked;
 import org.jctools.queues.spec.ConcurrentQueueSpec;
 import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.ArrayList;
-import java.util.Collection;
 
 @RunWith(Parameterized.class)
 public class AtomicMpqSanityTestSpscLinked extends MpqSanityTestSpscLinked
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpscUnbounded.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpscUnbounded.java
index 8b66b56a..93cd54a8 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpscUnbounded.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicMpqSanityTestSpscUnbounded.java
@@ -1,16 +1,16 @@
 package org.jctools.queues.atomic;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import org.jctools.queues.MessagePassingQueue;
-import org.jctools.queues.MpqSanityTest;
 import org.jctools.queues.MpqSanityTestSpscUnbounded;
 import org.jctools.queues.SpscUnboundedArrayQueue;
 import org.jctools.queues.spec.ConcurrentQueueSpec;
 import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.ArrayList;
-import java.util.Collection;
 
 @RunWith(Parameterized.class)
 public class AtomicMpqSanityTestSpscUnbounded extends MpqSanityTestSpscUnbounded
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpmcArray.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpmcArray.java
index c4e55f5c..3d0db714 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpmcArray.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpmcArray.java
@@ -1,15 +1,16 @@
 package org.jctools.queues.atomic;
 
-import org.jctools.queues.QueueSanityTestMpmcArray;
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.QueueSanityTestMpmcArray;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 
 public class AtomicQueueSanityTestMpmcArray extends QueueSanityTestMpmcArray
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpscArray.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpscArray.java
index d5e39787..61f6baad 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpscArray.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpscArray.java
@@ -1,15 +1,16 @@
 package org.jctools.queues.atomic;
 
-import org.jctools.queues.QueueSanityTestMpscArray;
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.QueueSanityTestMpscArray;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 public class AtomicQueueSanityTestMpscArray extends QueueSanityTestMpscArray
 {
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpscChunked.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpscChunked.java
index a1a6433a..4aca3246 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpscChunked.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpscChunked.java
@@ -1,15 +1,16 @@
 package org.jctools.queues.atomic;
 
-import org.jctools.queues.QueueSanityTestMpscChunked;
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.QueueSanityTestMpscChunked;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 public class AtomicQueueSanityTestMpscChunked extends QueueSanityTestMpscChunked
 {
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpscGrowable.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpscGrowable.java
index 29cabba9..512547ff 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpscGrowable.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpscGrowable.java
@@ -1,15 +1,16 @@
 package org.jctools.queues.atomic;
 
-import org.jctools.queues.QueueSanityTestMpscGrowable;
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.QueueSanityTestMpscGrowable;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 public class AtomicQueueSanityTestMpscGrowable extends QueueSanityTestMpscGrowable
 {
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpscLinked.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpscLinked.java
index 45e259c1..fadb8870 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpscLinked.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpscLinked.java
@@ -1,15 +1,16 @@
 package org.jctools.queues.atomic;
 
-import org.jctools.queues.QueueSanityTestMpscLinked;
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.QueueSanityTestMpscLinked;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 public class AtomicQueueSanityTestMpscLinked extends QueueSanityTestMpscLinked
 {
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpscUnboundedArray.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpscUnboundedArray.java
index 0e71fe16..4052899b 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpscUnboundedArray.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestMpscUnboundedArray.java
@@ -1,15 +1,16 @@
 package org.jctools.queues.atomic;
 
-import org.jctools.queues.QueueSanityTestMpscUnboundedArray;
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.QueueSanityTestMpscUnboundedArray;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 public class AtomicQueueSanityTestMpscUnboundedArray extends QueueSanityTestMpscUnboundedArray
 {
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpmcArray.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpmcArray.java
index 951c5dbb..6954edce 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpmcArray.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpmcArray.java
@@ -1,15 +1,16 @@
 package org.jctools.queues.atomic;
 
-import org.jctools.queues.QueueSanityTestSpmcArray;
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.QueueSanityTestSpmcArray;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 
 public class AtomicQueueSanityTestSpmcArray extends QueueSanityTestSpmcArray
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpscArray.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpscArray.java
index e29566e6..e9ab2851 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpscArray.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpscArray.java
@@ -1,15 +1,16 @@
 package org.jctools.queues.atomic;
 
-import org.jctools.queues.QueueSanityTestSpscArray;
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.QueueSanityTestSpscArray;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 
 public class AtomicQueueSanityTestSpscArray extends QueueSanityTestSpscArray
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpscChunked.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpscChunked.java
index 4c2a592f..ae7c77ef 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpscChunked.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpscChunked.java
@@ -1,15 +1,16 @@
 package org.jctools.queues.atomic;
 
-import org.jctools.queues.QueueSanityTestSpscChunked;
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.QueueSanityTestSpscChunked;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 public class AtomicQueueSanityTestSpscChunked extends QueueSanityTestSpscChunked
 {
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpscGrowable.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpscGrowable.java
index 0d07cbd1..5518d852 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpscGrowable.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpscGrowable.java
@@ -1,15 +1,16 @@
 package org.jctools.queues.atomic;
 
-import org.jctools.queues.QueueSanityTestSpscGrowable;
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.QueueSanityTestSpscGrowable;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 public class AtomicQueueSanityTestSpscGrowable extends QueueSanityTestSpscGrowable
 {
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpscLinked.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpscLinked.java
index 2f3e5ff6..6959c2c8 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpscLinked.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpscLinked.java
@@ -1,15 +1,16 @@
 package org.jctools.queues.atomic;
 
-import org.jctools.queues.QueueSanityTestSpscLinked;
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.QueueSanityTestSpscLinked;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 public class AtomicQueueSanityTestSpscLinked extends QueueSanityTestSpscLinked
 {
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpscUnbounded.java b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpscUnbounded.java
index b0dfeec1..5b76f866 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpscUnbounded.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/AtomicQueueSanityTestSpscUnbounded.java
@@ -1,15 +1,16 @@
 package org.jctools.queues.atomic;
 
-import org.jctools.queues.QueueSanityTestSpscUnbounded;
-import org.jctools.queues.spec.ConcurrentQueueSpec;
-import org.jctools.queues.spec.Ordering;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Queue;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.jctools.queues.QueueSanityTestSpscUnbounded;
+import org.jctools.queues.spec.ConcurrentQueueSpec;
+import org.jctools.queues.spec.Ordering;
+
 @RunWith(Parameterized.class)
 public class AtomicQueueSanityTestSpscUnbounded extends QueueSanityTestSpscUnbounded
 {
diff --git a/jctools-core/src/test/java/org/jctools/queues/atomic/MpscLinkedAtomicQueueRemoveTest.java b/jctools-core/src/test/java/org/jctools/queues/atomic/MpscLinkedAtomicQueueRemoveTest.java
index e450f448..89e74f82 100644
--- a/jctools-core/src/test/java/org/jctools/queues/atomic/MpscLinkedAtomicQueueRemoveTest.java
+++ b/jctools-core/src/test/java/org/jctools/queues/atomic/MpscLinkedAtomicQueueRemoveTest.java
@@ -1,9 +1,9 @@
 package org.jctools.queues.atomic;
 
-import org.jctools.queues.ScQueueRemoveTest;
-
 import java.util.Queue;
 
+import org.jctools.queues.ScQueueRemoveTest;
+
 public class MpscLinkedAtomicQueueRemoveTest extends ScQueueRemoveTest {
     @Override
     protected Queue<Integer> newQueue() {
diff --git a/jctools-core/src/test/java/org/jctools/queues/matchers/Matchers.java b/jctools-core/src/test/java/org/jctools/queues/matchers/Matchers.java
index f6aac01d..84780ab4 100644
--- a/jctools-core/src/test/java/org/jctools/queues/matchers/Matchers.java
+++ b/jctools-core/src/test/java/org/jctools/queues/matchers/Matchers.java
@@ -1,9 +1,9 @@
 package org.jctools.queues.matchers;
 
-import org.hamcrest.Matcher;
-
 import java.util.Collection;
 
+import org.hamcrest.Matcher;
+
 import static org.hamcrest.Matchers.*;
 
 /**