diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/split/InputSplitTests.java b/datavec/datavec-api/src/test/java/org/datavec/api/split/InputSplitTests.java
index 74c4c3bc9..b854c9967 100644
--- a/datavec/datavec-api/src/test/java/org/datavec/api/split/InputSplitTests.java
+++ b/datavec/datavec-api/src/test/java/org/datavec/api/split/InputSplitTests.java
@@ -34,8 +34,9 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Random;
 
-import static junit.framework.TestCase.assertTrue;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  *
diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/split/parittion/PartitionerTests.java b/datavec/datavec-api/src/test/java/org/datavec/api/split/parittion/PartitionerTests.java
index f9c5cb1b6..e1ed7b50b 100644
--- a/datavec/datavec-api/src/test/java/org/datavec/api/split/parittion/PartitionerTests.java
+++ b/datavec/datavec-api/src/test/java/org/datavec/api/split/parittion/PartitionerTests.java
@@ -32,9 +32,7 @@ import org.junit.jupiter.api.Test;
 import java.io.File;
 import java.io.OutputStream;
 
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class PartitionerTests extends BaseND4JTest {
     @Test
diff --git a/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/TestTransforms.java b/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/TestTransforms.java
index c42981d27..1d9d72189 100644
--- a/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/TestTransforms.java
+++ b/datavec/datavec-api/src/test/java/org/datavec/api/transform/transform/TestTransforms.java
@@ -58,7 +58,7 @@ import org.datavec.api.transform.transform.time.TimeMathOpTransform;
 import org.datavec.api.writable.*;
 import org.joda.time.DateTimeFieldType;
 import org.joda.time.DateTimeZone;
-import org.junit.Assert;
+
 import org.junit.jupiter.api.Test;
 import org.nd4j.common.tests.BaseND4JTest;
 import org.nd4j.linalg.api.ndarray.INDArray;
@@ -71,7 +71,7 @@ import java.io.ObjectOutputStream;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import static junit.framework.TestCase.assertEquals;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 public class TestTransforms extends BaseND4JTest {
@@ -277,22 +277,22 @@ public class TestTransforms extends BaseND4JTest {
         List<String> outputColumns = new ArrayList<>(ALL_COLUMNS);
         outputColumns.add(NEW_COLUMN);
         Schema newSchema = transform.transform(schema);
-        Assert.assertEquals(outputColumns, newSchema.getColumnNames());
+        assertEquals(outputColumns, newSchema.getColumnNames());
 
         List<Writable> input = new ArrayList<>();
         input.addAll(COLUMN_VALUES);
 
         transform.setInputSchema(schema);
         List<Writable> transformed = transform.map(input);
-        Assert.assertEquals(NEW_COLUMN_VALUE, transformed.get(transformed.size() - 1).toString());
+        assertEquals(NEW_COLUMN_VALUE, transformed.get(transformed.size() - 1).toString());
 
         List<Text> outputColumnValues = new ArrayList<>(COLUMN_VALUES);
         outputColumnValues.add(new Text(NEW_COLUMN_VALUE));
-        Assert.assertEquals(outputColumnValues, transformed);
+        assertEquals(outputColumnValues, transformed);
 
         String s = JsonMappers.getMapper().writeValueAsString(transform);
         Transform transform2 = JsonMappers.getMapper().readValue(s, ConcatenateStringColumns.class);
-        Assert.assertEquals(transform, transform2);
+        assertEquals(transform, transform2);
     }
 
     @Test
@@ -309,7 +309,7 @@ public class TestTransforms extends BaseND4JTest {
         transform.setInputSchema(schema);
         Schema newSchema = transform.transform(schema);
         List<String> outputColumns = new ArrayList<>(ALL_COLUMNS);
-        Assert.assertEquals(outputColumns, newSchema.getColumnNames());
+        assertEquals(outputColumns, newSchema.getColumnNames());
 
         transform = new ChangeCaseStringTransform(STRING_COLUMN, ChangeCaseStringTransform.CaseType.LOWER);
         transform.setInputSchema(schema);
@@ -320,8 +320,8 @@ public class TestTransforms extends BaseND4JTest {
         output.add(new Text(TEXT_LOWER_CASE));
         output.add(new Text(TEXT_MIXED_CASE));
         List<Writable> transformed = transform.map(input);
-        Assert.assertEquals(transformed.get(0).toString(), TEXT_LOWER_CASE);
-        Assert.assertEquals(transformed, output);
+        assertEquals(transformed.get(0).toString(), TEXT_LOWER_CASE);
+        assertEquals(transformed, output);
 
         transform = new ChangeCaseStringTransform(STRING_COLUMN, ChangeCaseStringTransform.CaseType.UPPER);
         transform.setInputSchema(schema);
@@ -329,12 +329,12 @@ public class TestTransforms extends BaseND4JTest {
         output.add(new Text(TEXT_UPPER_CASE));
         output.add(new Text(TEXT_MIXED_CASE));
         transformed = transform.map(input);
-        Assert.assertEquals(transformed.get(0).toString(), TEXT_UPPER_CASE);
-        Assert.assertEquals(transformed, output);
+        assertEquals(transformed.get(0).toString(), TEXT_UPPER_CASE);
+        assertEquals(transformed, output);
 
         String s = JsonMappers.getMapper().writeValueAsString(transform);
         Transform transform2 = JsonMappers.getMapper().readValue(s, ChangeCaseStringTransform.class);
-        Assert.assertEquals(transform, transform2);
+        assertEquals(transform, transform2);
     }
 
     @Test
@@ -1530,7 +1530,7 @@ public class TestTransforms extends BaseND4JTest {
 
         String json = JsonMappers.getMapper().writeValueAsString(t);
         Transform transform2 = JsonMappers.getMapper().readValue(json, StringListToCountsNDArrayTransform.class);
-        Assert.assertEquals(t, transform2);
+        assertEquals(t, transform2);
     }
 
 
@@ -1551,7 +1551,7 @@ public class TestTransforms extends BaseND4JTest {
 
         String json = JsonMappers.getMapper().writeValueAsString(t);
         Transform transform2 = JsonMappers.getMapper().readValue(json, StringListToIndicesNDArrayTransform.class);
-        Assert.assertEquals(t, transform2);
+        assertEquals(t, transform2);
     }
 
 
diff --git a/datavec/datavec-arrow/src/test/java/org/datavec/arrow/ArrowConverterTest.java b/datavec/datavec-arrow/src/test/java/org/datavec/arrow/ArrowConverterTest.java
index a0300d73c..f019e8955 100644
--- a/datavec/datavec-arrow/src/test/java/org/datavec/arrow/ArrowConverterTest.java
+++ b/datavec/datavec-arrow/src/test/java/org/datavec/arrow/ArrowConverterTest.java
@@ -54,10 +54,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.*;
 import static java.nio.channels.Channels.newChannel;
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.*;
+
 import org.junit.jupiter.api.DisplayName;
 import java.nio.file.Path;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/datavec/datavec-local/src/test/java/org/datavec/local/transforms/transform/TestPythonTransformProcess.java b/datavec/datavec-local/src/test/java/org/datavec/local/transforms/transform/TestPythonTransformProcess.java
index d8b9d423b..2ef20194d 100644
--- a/datavec/datavec-local/src/test/java/org/datavec/local/transforms/transform/TestPythonTransformProcess.java
+++ b/datavec/datavec-local/src/test/java/org/datavec/local/transforms/transform/TestPythonTransformProcess.java
@@ -42,7 +42,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import static junit.framework.TestCase.assertTrue;
+
 import static org.datavec.api.transform.schema.Schema.Builder;
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/datavec/datavec-spark/src/test/java/org/datavec/spark/transform/NormalizationTests.java b/datavec/datavec-spark/src/test/java/org/datavec/spark/transform/NormalizationTests.java
index 61a7c59be..769e7c775 100644
--- a/datavec/datavec-spark/src/test/java/org/datavec/spark/transform/NormalizationTests.java
+++ b/datavec/datavec-spark/src/test/java/org/datavec/spark/transform/NormalizationTests.java
@@ -40,8 +40,9 @@ import org.nd4j.linalg.factory.Nd4j;
 import java.util.ArrayList;
 import java.util.List;
 
-import static junit.framework.TestCase.assertTrue;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class NormalizationTests extends BaseSparkTest {
 
diff --git a/datavec/pom.xml b/datavec/pom.xml
index 65f1afc61..6c4d9496a 100644
--- a/datavec/pom.xml
+++ b/datavec/pom.xml
@@ -165,9 +165,8 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${maven-surefire-plugin.version}</version>
                     <configuration>
-                        <argLine> "</argLine>
+                        <argLine></argLine>
 
                         <!--
                         By default: Surefire will set the classpath based on the manifest. Because tests are not included
diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/TestAsyncIterator.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/TestAsyncIterator.java
index 8507df4c1..57c4c8243 100644
--- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/TestAsyncIterator.java
+++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/datasets/iterator/TestAsyncIterator.java
@@ -32,7 +32,7 @@ import org.nd4j.linalg.factory.Nd4j;
 
 import java.util.List;
 
-import static junit.framework.TestCase.assertTrue;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 @Disabled
diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvalJsonTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvalJsonTest.java
index 9d235ac92..fc98ff5bb 100644
--- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvalJsonTest.java
+++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/eval/EvalJsonTest.java
@@ -27,12 +27,11 @@ import org.nd4j.evaluation.curves.RocCurve;
 import org.nd4j.linalg.api.ndarray.INDArray;
 import org.nd4j.linalg.api.ops.random.impl.BernoulliDistribution;
 import org.nd4j.linalg.factory.Nd4j;
-import static junit.framework.TestCase.assertNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 @DisplayName("Eval Json Test")
 class EvalJsonTest extends BaseDL4JTest {
 
diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/gradientcheck/YoloGradientCheckTests.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/gradientcheck/YoloGradientCheckTests.java
index 5c4c42d62..205b277ef 100644
--- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/gradientcheck/YoloGradientCheckTests.java
+++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/gradientcheck/YoloGradientCheckTests.java
@@ -79,7 +79,6 @@ public class YoloGradientCheckTests extends BaseDL4JTest {
         return 90000L;
     }
 
-    @Test
     @ParameterizedTest
     @MethodSource("#params")
     public void testYoloOutputLayer(CNN2DFormat format) {
@@ -180,7 +179,6 @@ public class YoloGradientCheckTests extends BaseDL4JTest {
     }
 
 
-    @Test
     @ParameterizedTest
     @MethodSource("#params")
     public void yoloGradientCheckRealData(@TempDir Path testDir,CNN2DFormat format) throws Exception {
diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/BidirectionalTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/BidirectionalTest.java
index 7ca17f048..75218f6a3 100644
--- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/BidirectionalTest.java
+++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/BidirectionalTest.java
@@ -150,7 +150,6 @@ class BidirectionalTest extends BaseDL4JTest {
     }
 
     @DisplayName("Compare Implementations Comp Graph")
-    @Test
     @ParameterizedTest
     @MethodSource("#params")
     void compareImplementationsCompGraph(RNNFormat rnnFormat) {
diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/MaskZeroLayerTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/MaskZeroLayerTest.java
index 300386448..32776e955 100644
--- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/MaskZeroLayerTest.java
+++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/MaskZeroLayerTest.java
@@ -55,7 +55,6 @@ class MaskZeroLayerTest extends BaseDL4JTest {
     }
 
     @DisplayName("Activate")
-    @Test
     @ParameterizedTest
     @MethodSource("#params")
     void activate(RNNFormat rnnDataFormat) {
@@ -96,7 +95,6 @@ class MaskZeroLayerTest extends BaseDL4JTest {
 
 
     @DisplayName("Test Serialization")
-    @Test
     @ParameterizedTest
     @MethodSource("#params")
     void testSerialization(RNNFormat rnnDataFormat) {
diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/RnnDataFormatTests.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/RnnDataFormatTests.java
index b21c0ffc2..0c0115c96 100644
--- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/RnnDataFormatTests.java
+++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/RnnDataFormatTests.java
@@ -109,7 +109,6 @@ public class RnnDataFormatTests extends BaseDL4JTest {
         }
     }
 
-    @Test
     @ParameterizedTest
     @MethodSource("#params")
     public void testLSTM(boolean helpers,
diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/TestLastTimeStepLayer.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/TestLastTimeStepLayer.java
index 65f8c98f0..213a92896 100644
--- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/TestLastTimeStepLayer.java
+++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/TestLastTimeStepLayer.java
@@ -62,7 +62,6 @@ public class TestLastTimeStepLayer extends BaseDL4JTest {
         return Arrays.asList(RNNFormat.values()).stream().map(Arguments::of);
     }
 
-    @Test
     @ParameterizedTest
     @MethodSource("#params")
     public void testLastTimeStepVertex(RNNFormat rnnDataFormat) {
@@ -127,7 +126,6 @@ public class TestLastTimeStepLayer extends BaseDL4JTest {
         TestUtils.testModelSerialization(graph);
     }
 
-    @Test
     @ParameterizedTest
     @MethodSource("#params")
     public void testMaskingAndAllMasked(RNNFormat rnnDataFormat) {
diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/TestRnnLayers.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/TestRnnLayers.java
index 11920bce9..e40128ca9 100644
--- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/TestRnnLayers.java
+++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/TestRnnLayers.java
@@ -65,7 +65,6 @@ public class TestRnnLayers extends BaseDL4JTest {
         return Arrays.asList(RNNFormat.values()).stream().map(Arguments::of);
     }
 
-    @Test
     @ParameterizedTest
     @MethodSource("#params")
     public void testTimeStepIs3Dimensional(RNNFormat rnnDataFormat) {
@@ -117,7 +116,6 @@ public class TestRnnLayers extends BaseDL4JTest {
 
     }
 
-    @Test
     @ParameterizedTest
     @MethodSource("#params")
     public void testDropoutRecurrentLayers(RNNFormat rnnDataFormat){
@@ -217,7 +215,6 @@ public class TestRnnLayers extends BaseDL4JTest {
         }
     }
 
-    @Test
     @ParameterizedTest
     @MethodSource("#params")
     public void testMismatchedInputLabelLength(RNNFormat rnnDataFormat){
diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/TestSimpleRnn.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/TestSimpleRnn.java
index 58af7fe4b..83e97eab2 100644
--- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/TestSimpleRnn.java
+++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/TestSimpleRnn.java
@@ -55,7 +55,6 @@ public class TestSimpleRnn extends BaseDL4JTest {
         return Arrays.asList(RNNFormat.values()).stream().map(Arguments::of);
     }
 
-    @Test
     @ParameterizedTest
     @MethodSource("#params")
     public void testSimpleRnn(RNNFormat rnnDataFormat) {
@@ -126,7 +125,6 @@ public class TestSimpleRnn extends BaseDL4JTest {
         TestUtils.testModelSerialization(net);
     }
 
-    @Test
     @ParameterizedTest
     @MethodSource("#params")
     public void testBiasInit(RNNFormat rnnDataFormat) {
diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/TestTimeDistributed.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/TestTimeDistributed.java
index 44ce4c383..60d03ff02 100644
--- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/TestTimeDistributed.java
+++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/nn/layers/recurrent/TestTimeDistributed.java
@@ -61,7 +61,6 @@ public class TestTimeDistributed extends BaseDL4JTest {
         return Arrays.asList(RNNFormat.values()).stream().map(Arguments::of);
     }
 
-    @Test
     @ParameterizedTest
     @MethodSource("#params")
     public void testTimeDistributed(RNNFormat rnnDataFormat){
diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/perf/listener/TestHardWareMetric.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/perf/listener/TestHardWareMetric.java
index b99c222bf..7c6056482 100644
--- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/perf/listener/TestHardWareMetric.java
+++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/perf/listener/TestHardWareMetric.java
@@ -26,8 +26,8 @@ import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import oshi.json.SystemInfo;
 
-import static junit.framework.TestCase.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @Disabled("AB 2019/05/24 - Failing on CI - \"Could not initialize class oshi.jna.platform.linux.Libc\" - Issue #7657")
 public class TestHardWareMetric extends BaseDL4JTest {
diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelGuesserTest.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelGuesserTest.java
index 3125c7099..88570b4d3 100644
--- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelGuesserTest.java
+++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelGuesserTest.java
@@ -45,9 +45,9 @@ import org.nd4j.linalg.learning.config.Sgd;
 import org.nd4j.linalg.lossfunctions.LossFunctions;
 import org.nd4j.common.resources.Resources;
 import java.io.*;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.Assume.assumeNotNull;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assumptions.*;
 import org.junit.jupiter.api.DisplayName;
 import java.nio.file.Path;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -67,11 +67,11 @@ class ModelGuesserTest extends BaseDL4JTest {
         File f = Resources.asFile("modelimport/keras/examples/mnist_mlp/mnist_mlp_tf_keras_1_model.h5");
         assertTrue(f.exists());
         Model guess1 = ModelGuesser.loadModelGuess(f.getAbsolutePath());
-        assumeNotNull(guess1);
+        assertNotNull(guess1);
         f = Resources.asFile("modelimport/keras/examples/mnist_cnn/mnist_cnn_tf_keras_1_model.h5");
         assertTrue(f.exists());
         Model guess2 = ModelGuesser.loadModelGuess(f.getAbsolutePath());
-        assumeNotNull(guess2);
+        assertNotNull(guess2);
     }
 
     @Test
@@ -81,13 +81,13 @@ class ModelGuesserTest extends BaseDL4JTest {
         assertTrue(f.exists());
         try (InputStream inputStream = new FileInputStream(f)) {
             Model guess1 = ModelGuesser.loadModelGuess(inputStream);
-            assumeNotNull(guess1);
+            assertNotNull(guess1);
         }
         f = Resources.asFile("modelimport/keras/examples/mnist_cnn/mnist_cnn_tf_keras_1_model.h5");
         assertTrue(f.exists());
         try (InputStream inputStream = new FileInputStream(f)) {
             Model guess1 = ModelGuesser.loadModelGuess(inputStream);
-            assumeNotNull(guess1);
+            assertNotNull(guess1);
         }
     }
 
@@ -157,7 +157,7 @@ class ModelGuesserTest extends BaseDL4JTest {
         ModelSerializer.writeModel(net, tempFile, true);
         try (InputStream inputStream = new FileInputStream(tempFile)) {
             MultiLayerNetwork network = (MultiLayerNetwork) ModelGuesser.loadModelGuess(inputStream);
-            assumeNotNull(network);
+            assertNotNull(network);
             assertEquals(network.getLayerWiseConfigurations().toJson(), net.getLayerWiseConfigurations().toJson());
             assertEquals(net.params(), network.params());
             assertEquals(net.getUpdater().getStateViewArray(), network.getUpdater().getStateViewArray());
diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelValidatorTests.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelValidatorTests.java
index 4188e642e..ae696d86b 100644
--- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelValidatorTests.java
+++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/ModelValidatorTests.java
@@ -52,7 +52,7 @@ import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
-import static junit.framework.TestCase.assertTrue;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 public class ModelValidatorTests extends BaseDL4JTest {
@@ -91,7 +91,7 @@ public class ModelValidatorTests extends BaseDL4JTest {
         ValidationResult vr2 = DL4JModelValidator.validateMultiLayerNetwork(f2);
         assertFalse(vr2.isValid());
         String s = vr2.getIssues().get(0);
-        assertTrue(s, s.contains("zip") && s.contains("corrupt"));
+        assertTrue(s.contains("zip") && s.contains("corrupt"), s);
         assertEquals("MultiLayerNetwork", vr2.getFormatType());
         assertEquals(MultiLayerNetwork.class, vr2.getFormatClass());
         assertNotNull(vr2.getException());
@@ -108,7 +108,7 @@ public class ModelValidatorTests extends BaseDL4JTest {
         assertFalse(vr3.isValid());
         s = vr3.getIssues().get(0);
         assertEquals(1, vr3.getIssues().size());
-        assertTrue(s, s.contains("missing") && s.contains("configuration"));
+        assertTrue(s.contains("missing") && s.contains("configuration"), s);
         assertEquals("MultiLayerNetwork", vr3.getFormatType());
         assertEquals(MultiLayerNetwork.class, vr3.getFormatClass());
         assertNull(vr3.getException());
@@ -126,7 +126,7 @@ public class ModelValidatorTests extends BaseDL4JTest {
         assertFalse(vr4.isValid());
         s = vr4.getIssues().get(0);
         assertEquals(1, vr4.getIssues().size());
-        assertTrue(s, s.contains("missing") && s.contains("coefficients"));
+        assertTrue(s.contains("missing") && s.contains("coefficients"), s);
         assertEquals("MultiLayerNetwork", vr4.getFormatType());
         assertEquals(MultiLayerNetwork.class, vr4.getFormatClass());
         assertNull(vr4.getException());
@@ -169,7 +169,7 @@ public class ModelValidatorTests extends BaseDL4JTest {
         assertFalse(vr6.isValid());
         s = vr6.getIssues().get(0);
         assertEquals(1, vr6.getIssues().size());
-        assertTrue(s, s.contains("JSON") && s.contains("valid") && s.contains("MultiLayerConfiguration"));
+        assertTrue(s.contains("JSON") && s.contains("valid") && s.contains("MultiLayerConfiguration"), s);
         assertEquals("MultiLayerNetwork", vr6.getFormatType());
         assertEquals(MultiLayerNetwork.class, vr6.getFormatClass());
         assertNotNull(vr6.getException());
@@ -209,7 +209,7 @@ public class ModelValidatorTests extends BaseDL4JTest {
         ValidationResult vr2 = DL4JModelValidator.validateComputationGraph(f2);
         assertFalse(vr2.isValid());
         String s = vr2.getIssues().get(0);
-        assertTrue(s, s.contains("zip") && s.contains("corrupt"));
+        assertTrue(s.contains("zip") && s.contains("corrupt"), s);
         assertEquals("ComputationGraph", vr2.getFormatType());
         assertEquals(ComputationGraph.class, vr2.getFormatClass());
         assertNotNull(vr2.getException());
@@ -226,7 +226,7 @@ public class ModelValidatorTests extends BaseDL4JTest {
         assertFalse(vr3.isValid());
         s = vr3.getIssues().get(0);
         assertEquals(1, vr3.getIssues().size());
-        assertTrue(s, s.contains("missing") && s.contains("configuration"));
+        assertTrue(s.contains("missing") && s.contains("configuration"), s);
         assertEquals("ComputationGraph", vr3.getFormatType());
         assertEquals(ComputationGraph.class, vr3.getFormatClass());
         assertNull(vr3.getException());
@@ -244,7 +244,7 @@ public class ModelValidatorTests extends BaseDL4JTest {
         assertFalse(vr4.isValid());
         s = vr4.getIssues().get(0);
         assertEquals(1, vr4.getIssues().size());
-        assertTrue(s, s.contains("missing") && s.contains("coefficients"));
+        assertTrue(s.contains("missing") && s.contains("coefficients"), s);
         assertEquals("ComputationGraph", vr4.getFormatType());
         assertEquals(ComputationGraph.class, vr4.getFormatClass());
         assertNull(vr4.getException());
@@ -287,7 +287,7 @@ public class ModelValidatorTests extends BaseDL4JTest {
         assertFalse(vr6.isValid());
         s = vr6.getIssues().get(0);
         assertEquals(1, vr6.getIssues().size());
-        assertTrue(s, s.contains("JSON") && s.contains("valid") && s.contains("ComputationGraphConfiguration"));
+        assertTrue(s.contains("JSON") && s.contains("valid") && s.contains("ComputationGraphConfiguration"), s);
         assertEquals("ComputationGraph", vr6.getFormatType());
         assertEquals(ComputationGraph.class, vr6.getFormatClass());
         assertNotNull(vr6.getException());
diff --git a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/TestUIDProvider.java b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/TestUIDProvider.java
index 9f0ecd29c..04a5b8742 100644
--- a/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/TestUIDProvider.java
+++ b/deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/util/TestUIDProvider.java
@@ -24,9 +24,7 @@ import org.deeplearning4j.BaseDL4JTest;
 import org.deeplearning4j.core.util.UIDProvider;
 import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class TestUIDProvider extends BaseDL4JTest {
 
diff --git a/deeplearning4j/deeplearning4j-modelimport/pom.xml b/deeplearning4j/deeplearning4j-modelimport/pom.xml
index 9f1a92c98..12dc079bb 100644
--- a/deeplearning4j/deeplearning4j-modelimport/pom.xml
+++ b/deeplearning4j/deeplearning4j-modelimport/pom.xml
@@ -89,6 +89,10 @@
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.deeplearning4j</groupId>
             <artifactId>deeplearning4j-common-tests</artifactId>
@@ -120,113 +124,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>test-nd4j-native</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.nd4j</groupId>
-                    <artifactId>nd4j-native</artifactId>
-                    <version>${project.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <inherited>true</inherited>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.nd4j</groupId>
-                                <artifactId>nd4j-native</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                        <configuration>
-                            <environmentVariables>
-
-                            </environmentVariables>
-                            <testSourceDirectory>src/test/java</testSourceDirectory>
-                            <includes>
-                                <include>*.java</include>
-                                <include>**/*.java</include>
-                                <include>**/Test*.java</include>
-                                <include>**/*Test.java</include>
-                                <include>**/*TestCase.java</include>
-                            </includes>
-                            <junitArtifactName>org.junit.jupiter:junit-jupiter</junitArtifactName>
-                            <systemPropertyVariables>
-                                <org.nd4j.linalg.defaultbackend>
-                                    org.nd4j.linalg.cpu.nativecpu.CpuBackend
-                                </org.nd4j.linalg.defaultbackend>
-                                <org.nd4j.linalg.tests.backendstorun>
-                                    org.nd4j.linalg.cpu.nativecpu.CpuBackend
-                                </org.nd4j.linalg.tests.backendstorun>
-                            </systemPropertyVariables>
-                            <!--
-                                Maximum heap size was set to 8g, as a minimum required value for tests run.
-                                Depending on a build machine, default value is not always enough.
-
-                                For testing large zoo models, this may not be enough (so comment it out).
-                            -->
-                            <argLine></argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>test-nd4j-cuda-11.0</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.nd4j</groupId>
-                    <artifactId>nd4j-cuda-11.0</artifactId>
-                    <version>${project.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>2.19.1</version>
-                            </dependency>
-                        </dependencies>
-                        <configuration>
-                            <environmentVariables>
-                            </environmentVariables>
-                            <testSourceDirectory>src/test/java</testSourceDirectory>
-                            <includes>
-                                <include>*.java</include>
-                                <include>**/*.java</include>
-                                <include>**/Test*.java</include>
-                                <include>**/*Test.java</include>
-                                <include>**/*TestCase.java</include>
-                            </includes>
-                            <junitArtifactName>org.junit.jupiter:junit-jupiter</junitArtifactName>
-                            <systemPropertyVariables>
-                                <org.nd4j.linalg.defaultbackend>
-                                    org.nd4j.linalg.jcublas.JCublasBackend
-                                </org.nd4j.linalg.defaultbackend>
-                                <org.nd4j.linalg.tests.backendstorun>
-                                    org.nd4j.linalg.jcublas.JCublasBackend
-                                </org.nd4j.linalg.tests.backendstorun>
-                            </systemPropertyVariables>
-                            <!--
-                                Maximum heap size was set to 6g, as a minimum required value for tests run.
-                                Depending on a build machine, default value is not always enough.
-                            -->
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/deeplearning4j/pom.xml b/deeplearning4j/pom.xml
index 32eb429f8..475b84d15 100644
--- a/deeplearning4j/pom.xml
+++ b/deeplearning4j/pom.xml
@@ -107,17 +107,18 @@
     </dependencyManagement>
 
     <dependencies>
+        <!-- For unit tests -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -230,7 +231,6 @@
             <plugins>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${maven-surefire-plugin.version}</version>
                     <inherited>true</inherited>
                     <configuration>
                         <!--
@@ -250,6 +250,13 @@
                             <include>**/*.java</include>
                         </includes>
                     </configuration>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.maven.surefire</groupId>
+                            <artifactId>surefire-junit-platform</artifactId>
+                            <version>${maven-surefire-plugin.version}</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.eclipse.m2e</groupId>
@@ -316,6 +323,21 @@
                                 <artifactId>nd4j-native</artifactId>
                                 <version>${project.version}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>org.junit.jupiter</groupId>
+                                <artifactId>junit-jupiter-engine</artifactId>
+                                <version>${junit.version}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>org.junit.jupiter</groupId>
+                                <artifactId>junit-jupiter-params</artifactId>
+                                <version>${junit.version}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>org.apache.maven.surefire</groupId>
+                                <artifactId>surefire-junit-platform</artifactId>
+                                <version>${maven-surefire-plugin.version}</version>
+                            </dependency>
                         </dependencies>
                         <configuration>
                             <environmentVariables>
@@ -344,7 +366,7 @@
 
                                 For testing large zoo models, this may not be enough (so comment it out).
                             -->
-                            <argLine> "</argLine>
+                            <argLine></argLine>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -376,13 +398,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.junit</groupId>
-                                <artifactId>surefire-junit5</artifactId>
-                                <version>5.0.0-ALPHA</version>
-                            </dependency>
-                        </dependencies>
+                        <version>${maven-surefire-plugin.version}</version>
                         <configuration>
                             <environmentVariables>
                             </environmentVariables>
@@ -409,6 +425,7 @@
                             -->
                             <argLine> -Djava.library.path="${nd4j.basedir}/nd4j-backends/nd4j-backend-impls/nd4j-cuda/target/classes"</argLine>
                         </configuration>
+
                     </plugin>
                 </plugins>
             </build>
diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/protobuf/tf/google/protobuf/stubs/strutil.cc b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/protobuf/tf/google/protobuf/stubs/strutil.cc
index 1a4d71c82..5dda47c35 100644
--- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/protobuf/tf/google/protobuf/stubs/strutil.cc
+++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/protobuf/tf/google/protobuf/stubs/strutil.cc
@@ -1259,7 +1259,7 @@ char* DoubleToBuffer(double value, char* buffer) {
   // DBL_DIG is 15 for IEEE-754 doubles, which are used on almost all
   // platforms these days.  Just in case some system exists where DBL_DIG
   // is significantly larger -- and risks overflowing our buffer -- we have
-  // this assert.
+  // this
   GOOGLE_COMPILE_ASSERT(DBL_DIG < 20, DBL_DIG_is_too_big);
 
   if (value == std::numeric_limits<double>::infinity()) {
@@ -1377,7 +1377,7 @@ char* FloatToBuffer(float value, char* buffer) {
   // FLT_DIG is 6 for IEEE-754 floats, which are used on almost all
   // platforms these days.  Just in case some system exists where FLT_DIG
   // is significantly larger -- and risks overflowing our buffer -- we have
-  // this assert.
+  // this
   GOOGLE_COMPILE_ASSERT(FLT_DIG < 10, FLT_DIG_is_too_big);
 
   if (value == std::numeric_limits<double>::infinity()) {
diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/protobuf/tf/tensorflow/core/lib/strings/numbers.cc b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/protobuf/tf/tensorflow/core/lib/strings/numbers.cc
index 987e4fe73..f691746a8 100644
--- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/protobuf/tf/tensorflow/core/lib/strings/numbers.cc
+++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/protobuf/tf/tensorflow/core/lib/strings/numbers.cc
@@ -182,7 +182,7 @@ size_t DoubleToBuffer(double value, char* buffer) {
   // DBL_DIG is 15 for IEEE-754 doubles, which are used on almost all
   // platforms these days.  Just in case some system exists where DBL_DIG
   // is significantly larger -- and risks overflowing our buffer -- we have
-  // this assert.
+  // this
   static_assert(DBL_DIG < 20, "DBL_DIG is too big");
 
   if (std::abs(value) <= kDoublePrecisionCheckMax) {
@@ -363,7 +363,7 @@ size_t FloatToBuffer(float value, char* buffer) {
   // FLT_DIG is 6 for IEEE-754 floats, which are used on almost all
   // platforms these days.  Just in case some system exists where FLT_DIG
   // is significantly larger -- and risks overflowing our buffer -- we have
-  // this assert.
+  // this
   static_assert(FLT_DIG < 10, "FLT_DIG is too big");
 
   int snprintf_result =
diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml
index cdb5035aa..a906afb06 100644
--- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml
+++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml
@@ -139,13 +139,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>surefire-junit47</artifactId>
-                        <version>2.19.1</version>
-                    </dependency>
-                </dependencies>
                 <configuration>
                     <environmentVariables>
                         <LD_LIBRARY_PATH>
diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/pom.xml b/nd4j/nd4j-backends/nd4j-backend-impls/pom.xml
index 0c831eea6..644ac9cab 100644
--- a/nd4j/nd4j-backends/nd4j-backend-impls/pom.xml
+++ b/nd4j/nd4j-backends/nd4j-backend-impls/pom.xml
@@ -81,7 +81,6 @@
 
     <build>
         <plugins>
-
             <!-- Skip execution of Javadoc since some versions run out of memory -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -124,7 +123,6 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.19.1</version>
                     <configuration>
                         <environmentVariables>
                             <LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}:${user.dir}</LD_LIBRARY_PATH>
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/OpValidationSuite.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/OpValidationSuite.java
index 7294833ee..0f525ef6a 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/OpValidationSuite.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/OpValidationSuite.java
@@ -20,21 +20,19 @@
 
 package org.nd4j;
 
-import org.junit.AfterClass;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Disabled;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
 import org.nd4j.autodiff.opvalidation.*;
 import org.nd4j.autodiff.validation.OpValidation;
 //import org.nd4j.imports.tfgraphs.TFGraphTestAllSameDiff;
 import org.nd4j.linalg.api.buffer.DataType;
 import org.nd4j.linalg.factory.Nd4j;
 
-import static org.junit.Assume.assumeFalse;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+
+/*@Suite.SuiteClasses({
         //Note: these will be run as part of the suite only, and will NOT be run again separately
         LayerOpValidation.class,
         LossOpValidation.class,
@@ -48,7 +46,7 @@ import static org.junit.Assume.assumeFalse;
         //TF import tests
         //TFGraphTestAllSameDiff.class
         //TFGraphTestAllLibnd4j.class
-})
+})*/
 //IMPORTANT: This ignore is added to avoid maven surefire running both the suite AND the individual tests in "mvn test"
 // With it ignored here, the individual tests will run outside (i.e., separately/independently) of the suite in both "mvn test" and IntelliJ
 @Disabled
@@ -84,7 +82,7 @@ public class OpValidationSuite {
         Nd4j.getRandom().setSeed(123);
     }
 
-    @AfterClass
+    @AfterEach
     public static void afterClass() {
         Nd4j.setDataType(initialType);
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/TestOpMapping.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/TestOpMapping.java
index 3f2a5c689..a53453e32 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/TestOpMapping.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/TestOpMapping.java
@@ -145,9 +145,8 @@ public class TestOpMapping extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOpMappingCoverage() throws Exception {
         Map<String, DifferentialFunction> opNameMapping = ImportClassMapping.getOpNameMapping();
         Map<String, DifferentialFunction> tfOpNameMapping = ImportClassMapping.getTFOpMappingFunctions();
@@ -197,9 +196,8 @@ public class TestOpMapping extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOpsInNamespace(Nd4jBackend backend) throws Exception {
         //Ensure that every op is either in a namespace, OR it's explicitly marked as ignored (i.e., an op that we don't
         // want to add to a namespace for some reason)
@@ -361,7 +359,7 @@ public class TestOpMapping extends BaseNd4jTestWithBackends {
     @Test
     @Disabled
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void generateOpClassList(Nd4jBackend backend) throws Exception{
         Reflections reflections = new Reflections("org.nd4j");
         Set<Class<? extends DifferentialFunction>> subTypes = reflections.getSubTypesOf(DifferentialFunction.class);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/TestSessions.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/TestSessions.java
index d260be072..833f2bef5 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/TestSessions.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/TestSessions.java
@@ -55,9 +55,8 @@ public class TestSessions extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInferenceSessionBasic(Nd4jBackend backend) {
         //So far: trivial test to check execution order
 
@@ -89,9 +88,8 @@ public class TestSessions extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInferenceSessionBasic2(Nd4jBackend backend) {
         //So far: trivial test to check execution order
 
@@ -127,9 +125,8 @@ public class TestSessions extends BaseNd4jTestWithBackends {
         assertEquals(dExp, outMap.get("d"));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMergeSimple(Nd4jBackend backend) {
         //This isn't really a sensible graph, as merge op behaviour is undefined when multiple inputs are available...
 
@@ -165,9 +162,8 @@ public class TestSessions extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSwitchSimple(Nd4jBackend backend) {
 
         SameDiff sd = SameDiff.create();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/internal/TestDependencyTracker.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/internal/TestDependencyTracker.java
index 26e4567ff..13136c151 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/internal/TestDependencyTracker.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/internal/TestDependencyTracker.java
@@ -34,7 +34,6 @@ import org.nd4j.common.primitives.Pair;
 
 import java.util.Collections;
 
-import static junit.framework.TestCase.assertNotNull;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class TestDependencyTracker extends BaseNd4jTestWithBackends {
@@ -45,9 +44,8 @@ public class TestDependencyTracker extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSimple(Nd4jBackend backend){
 
         DependencyTracker<String,String> dt = new DependencyTracker<>();
@@ -94,9 +92,8 @@ public class TestDependencyTracker extends BaseNd4jTestWithBackends {
         assertTrue(dt.isEmpty());
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSatisfiedBeforeAdd(Nd4jBackend backend){
         DependencyTracker<String,String> dt = new DependencyTracker<>();
 
@@ -135,9 +132,8 @@ public class TestDependencyTracker extends BaseNd4jTestWithBackends {
         assertFalse(dt.hasNewAllSatisfied());
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMarkUnsatisfied(Nd4jBackend backend){
 
         DependencyTracker<String,String> dt = new DependencyTracker<>();
@@ -169,9 +165,8 @@ public class TestDependencyTracker extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIdentityDependencyTracker(){
         IdentityDependencyTracker<INDArray, String> dt = new IdentityDependencyTracker<>();
         assertTrue(dt.isEmpty());
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ActivationGradChecks.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ActivationGradChecks.java
index 66467ed62..a8fe416bc 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ActivationGradChecks.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ActivationGradChecks.java
@@ -41,9 +41,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 public class ActivationGradChecks extends BaseOpValidation {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testActivationGradientCheck1(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
         SameDiff sd = SameDiff.create();
@@ -61,9 +60,8 @@ public class ActivationGradChecks extends BaseOpValidation {
         assertTrue(ok);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testActivationGradientCheck2(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
         SameDiff sd = SameDiff.create();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/LayerOpValidation.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/LayerOpValidation.java
index 9f78afa5b..ea931b3a3 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/LayerOpValidation.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/LayerOpValidation.java
@@ -73,9 +73,8 @@ public class LayerOpValidation extends BaseOpValidation {
         return 90000L;
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testXwPlusB(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -109,9 +108,8 @@ public class LayerOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReluLayer(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -139,9 +137,8 @@ public class LayerOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBiasAdd(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -165,9 +162,8 @@ public class LayerOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConv2d(Nd4jBackend backend) {
         //avg pool, batch norm, conv2d, max pool 2d, pooling2d, upsampling
         //Tested elsewhere: deconv2d, depthwise2d, LRN, sconv2d
@@ -307,9 +303,8 @@ public class LayerOpValidation extends BaseOpValidation {
         assertEquals(0, failed.size(),failed.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLrn2d(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -350,9 +345,8 @@ public class LayerOpValidation extends BaseOpValidation {
         assertEquals(0, failed.size(),failed.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIm2Col(Nd4jBackend backend) {
         //OpValidationSuite.ignoreFailing();      //TEMPORARY DUE TO JVM CRASH: https://github.com/eclipse/deeplearning4j/issues/6873
         Nd4j.getRandom().setSeed(12345);
@@ -391,9 +385,8 @@ public class LayerOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOutputShape(Nd4jBackend backend) {
         long[] inSize = {1, 8, 8, 3};
 
@@ -443,9 +436,8 @@ public class LayerOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAvgPool(Nd4jBackend backend) {
         long[] inSize = {1, 8, 8, 3};  //NHWC
 
@@ -488,9 +480,8 @@ public class LayerOpValidation extends BaseOpValidation {
         return new int[]{in[0], in[2], in[3], in[4], in[1]};
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConv3d(Nd4jBackend backend) {
         //Pooling3d, Conv3D, batch norm
         Nd4j.getRandom().setSeed(12345);
@@ -592,9 +583,8 @@ public class LayerOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDepthWiseConv2dBasic(Nd4jBackend backend) {
         int nIn = 3;
         int depthWise = 4;
@@ -633,9 +623,8 @@ public class LayerOpValidation extends BaseOpValidation {
         assertArrayEquals(new long[]{mb, depthWise * nIn, 27, 27}, outShape);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSeparableConv2dBasic(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
         int nIn = 2;
@@ -691,9 +680,8 @@ public class LayerOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDeconv2dBasic(Nd4jBackend backend) {
         int nIn = 2;
         int nOut = 3;
@@ -737,9 +725,8 @@ public class LayerOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConv2dBasic(Nd4jBackend backend) {
         int nIn = 3;
         int nOut = 4;
@@ -780,9 +767,8 @@ public class LayerOpValidation extends BaseOpValidation {
         // sd.execBackwards(); // TODO: test failing here
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMaxPoolingArgMax(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
         int nIn = 3;
@@ -811,9 +797,8 @@ public class LayerOpValidation extends BaseOpValidation {
         assertArrayEquals(inArr.shape(), results[1].eval().shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMaxPooling2dBasic(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
         int nIn = 3;
@@ -871,9 +856,8 @@ public class LayerOpValidation extends BaseOpValidation {
         return max;
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAvgPooling2dBasic(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
         int nIn = 3;
@@ -922,9 +906,8 @@ public class LayerOpValidation extends BaseOpValidation {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAvgPooling3dBasic(Nd4jBackend backend) {
         int nIn = 3;
         int kH = 2;
@@ -961,9 +944,8 @@ public class LayerOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMaxPooling3dBasic(Nd4jBackend backend) {
         int nIn = 3;
         int kH = 2;
@@ -1001,9 +983,8 @@ public class LayerOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConv1dBasic(Nd4jBackend backend) {
         int nIn = 3;
         int nOut = 4;
@@ -1038,9 +1019,8 @@ public class LayerOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConv1dCausal(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
         int nIn = 3;
@@ -1089,9 +1069,8 @@ public class LayerOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConv1dForward(Nd4jBackend backend) {
         int nIn = 2;
         int nOut = 1;
@@ -1134,9 +1113,8 @@ public class LayerOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConv3dBasic(Nd4jBackend backend) {
         int nIn = 3;
         int nOut = 4;
@@ -1182,9 +1160,8 @@ public class LayerOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDeConv3dBasic(Nd4jBackend backend) {
         int nIn = 4;
         int nOut = 3;
@@ -1229,9 +1206,8 @@ public class LayerOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLayerNorm(Nd4jBackend backend) {
         final INDArray random = Nd4j.rand(DataType.DOUBLE, 10, 4);
         final INDArray standardized = random.ulike();
@@ -1256,9 +1232,8 @@ public class LayerOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLayerNorm4d(Nd4jBackend backend) {
         int mb = 3;
         int ch = 4;
@@ -1290,9 +1265,8 @@ public class LayerOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLayerNormOP(Nd4jBackend backend) {
         final INDArray random = Nd4j.rand(DataType.DOUBLE, 10, 4);
         final INDArray standardized = random.ulike();
@@ -1308,9 +1282,8 @@ public class LayerOpValidation extends BaseOpValidation {
         assertEquals(res, output);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLayerNormNoBias(Nd4jBackend backend) {
         final INDArray random = Nd4j.rand(DataType.DOUBLE, 10, 4);
         final INDArray standardized = random.ulike();
@@ -1333,9 +1306,8 @@ public class LayerOpValidation extends BaseOpValidation {
         assertNull(err, err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLayerNormOPNoBias(Nd4jBackend backend) {
         final INDArray random = Nd4j.rand(DataType.DOUBLE, 10, 4);
         final INDArray standardized = random.ulike();
@@ -1350,9 +1322,8 @@ public class LayerOpValidation extends BaseOpValidation {
         assertEquals(res, output);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLayerNormNoDeviation(Nd4jBackend backend) {
         final INDArray random = Nd4j.rand(DataType.DOUBLE, 10, 4);
         for (int i = 0; i < 4; i++) {
@@ -1467,9 +1438,8 @@ public class LayerOpValidation extends BaseOpValidation {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLayerNormMixedOrders(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
         INDArray input = Nd4j.rand(DataType.DOUBLE, 3, 8).dup('f');
@@ -1516,9 +1486,8 @@ public class LayerOpValidation extends BaseOpValidation {
         assertEquals(outCC, outFC);       //Fails here
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBiasAdd_nchw_nhwc(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -1549,9 +1518,8 @@ public class LayerOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDepthwiseConv2D(){
 
         int bS = 10;
@@ -1589,9 +1557,8 @@ public class LayerOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void LSTMLayerTestCase1(Nd4jBackend backend) {
 
         int bS = 5;
@@ -1666,9 +1633,8 @@ public class LayerOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void LSTMLayerTestCase2(Nd4jBackend backend) {
         int bS = 5;
         int nIn = 3;
@@ -1726,9 +1692,8 @@ public class LayerOpValidation extends BaseOpValidation {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void LSTMLayerTestCase3(Nd4jBackend backend) {
         int bS = 5;
         int nIn = 3;
@@ -1789,9 +1754,8 @@ public class LayerOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void GRUTestCase(Nd4jBackend backend) {
         int bS = 5;
         int nIn = 4;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/LossOpValidation.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/LossOpValidation.java
index dcf7d6971..59989176d 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/LossOpValidation.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/LossOpValidation.java
@@ -55,9 +55,8 @@ public class LossOpValidation extends BaseOpValidation {
     // All tested Loss Ops have backprop at the moment 2019/01/30
     public static final Set<String> NO_BP_YET = new HashSet<>();
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLoss2d(Nd4jBackend backend) {
         final List<String> oneDimensionalOutputFns = Arrays.asList("cosine", "mpwse", "softmaxxent", "softmaxxent_smooth", "mpwse", "sparsesoftmax");
 
@@ -369,9 +368,8 @@ public class LossOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCosineDistance(){
         INDArray arr = Nd4j.create(new double[][]{{-0.3, -0.2, -0.1}, {0, 0.1, 0.2}});
         INDArray label = Nd4j.create(new double[][]{{1.0, 2.0, 3.0}, {-1.0, 2.0, 1.0}});
@@ -389,9 +387,8 @@ public class LossOpValidation extends BaseOpValidation {
         assertEquals(exp, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testL2Loss(){
 
         for( int rank=0; rank<=3; rank++ ){
@@ -433,9 +430,8 @@ public class LossOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNonZeroResult(Nd4jBackend backend) {
         INDArray predictions = Nd4j.rand(DataType.DOUBLE, 10, 5);
         INDArray w = Nd4j.scalar(1.0);
@@ -493,9 +489,8 @@ public class LossOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void TestStdLossMixedDataType(){
         // Default Data Type in this test suite is Double.
         // This test used to throw an Exception that we have mixed data types.
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/MiscOpValidation.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/MiscOpValidation.java
index 0ca30d2ae..2654caf02 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/MiscOpValidation.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/MiscOpValidation.java
@@ -74,17 +74,17 @@ import org.nd4j.common.util.ArrayUtil;
 
 import java.util.*;
 
+
 import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.Assume.assumeNotNull;
+import static org.junit.jupiter.api.Assumptions.*;
 
 @Slf4j
 public class MiscOpValidation extends BaseOpValidation {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGradientAutoBroadcast1(Nd4jBackend backend) {
 
         Nd4j.getRandom().setSeed(12345);
@@ -171,9 +171,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertEquals(0, failed.size(),"Failed: " + failed);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGradientAutoBroadcast2(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -262,9 +261,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertEquals(0, failed.size(),"Failed: " + failed);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGradientAutoBroadcast3(Nd4jBackend backend) {
         //These tests: output size > input sizes
 
@@ -372,9 +370,8 @@ public class MiscOpValidation extends BaseOpValidation {
         return Long.MAX_VALUE;
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScatterOpGradients(Nd4jBackend backend) {
         List<String> failed = new ArrayList<>();
 
@@ -476,9 +473,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertEquals(0, failed.size(),failed.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScatterUpdate(){
         INDArray x = Nd4j.linspace(DataType.FLOAT, 1, 30, 1).reshape(10, 3);
         INDArray updates = Nd4j.create(new float[][]{
@@ -499,9 +495,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertEquals(exp, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGatherGradient(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -552,9 +547,8 @@ public class MiscOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTrace(){
         //TODO need to work out how to handle shape_op for scalars...
         //OpValidationSuite.ignoreFailing();
@@ -579,9 +573,8 @@ public class MiscOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTensorGradTensorMmul(Nd4jBackend backend) {
         OpValidationSuite.ignoreFailing();
 
@@ -603,9 +596,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMulGradient(Nd4jBackend backend) {
         INDArray arr1 = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray arr2 = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
@@ -670,9 +662,8 @@ public class MiscOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmulGradientManual(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray sumInput = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
@@ -689,14 +680,14 @@ public class MiscOpValidation extends BaseOpValidation {
         }, inputs);
 
 
-        assumeNotNull(sameDiff.getFunction("mmulGradient").getFunction("grad"));
-        assumeNotNull(sameDiff.getFunction("mmulGradient").grad("x"));
-        assumeNotNull(sameDiff.getFunction("mmulGradient").grad("y"));
+        assertNotNull(sameDiff.getFunction("mmulGradient").getFunction("grad"));
+        assertNotNull(sameDiff.getFunction("mmulGradient").grad("x"));
+        assertNotNull(sameDiff.getFunction("mmulGradient").grad("y"));
 
         SDVariable gradWrtX = sameDiff.getFunction("mmulGradient").grad("x");
         SDVariable gradWrtY = sameDiff.getFunction("mmulGradient").grad("y");
-        assumeNotNull(gradWrtX.getArr());
-        assumeNotNull(gradWrtY.getArr());
+        assertNotNull(gradWrtX.getArr());
+        assertNotNull(gradWrtY.getArr());
 
 
         INDArray xGradAssertion = Nd4j.create(new double[][]{
@@ -713,9 +704,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertEquals(yGradAssertion, gradWrtY.getArr());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmulGradients(){
         int[] aShape = new int[]{2,3};
         int[] bShape = new int[]{3,4};
@@ -766,9 +756,8 @@ public class MiscOpValidation extends BaseOpValidation {
         return new int[]{orig[1], orig[0]};
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBatchMmulBasic(Nd4jBackend backend) {
         OpValidationSuite.ignoreFailing();  //https://github.com/deeplearning4j/deeplearning4j/issues/6873
         int M = 5;
@@ -793,9 +782,8 @@ public class MiscOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmulWithTranspose(Nd4jBackend backend) {
 
         //Here: [x,3]^T * [x,4] = [3,4]
@@ -832,9 +820,8 @@ public class MiscOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmulOutputSizeCalculation(){
         //[3,2] x [2,4] with result transpose: output shape [4,3]
         INDArray a = Nd4j.create(3,2);
@@ -866,9 +853,8 @@ public class MiscOpValidation extends BaseOpValidation {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFillOp(){
 
         INDArray ia = Nd4j.createFromArray(new double[]{2,2}).castTo(DataType.INT);
@@ -882,9 +868,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testClipByNorm(){
         //Expected: if array.norm2(1) is less than 1.0, not modified
         //Otherwise: array.tad(x,1) = array.tad(x,1) * 1.0 / array.tad(x,1).norm2()
@@ -916,9 +901,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertEquals(exp, norm2_1b);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testClipByNorm2(){
         //Expected: if array.norm2(1) is less than 1.0, not modified
         //Otherwise: array.tad(x,1) = array.tad(x,1) * 1.0 / array.tad(x,1).norm2()
@@ -961,9 +945,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testClipByNorm1(){
         //Expected: if array.norm2(1) is less than 1.0, not modified
         //Otherwise: array.tad(x,1) = array.tad(x,1) * 1.0 / array.tad(x,1).norm2()
@@ -1003,9 +986,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testClipByNorm0(){
         //Expected: if array.norm2(0) is less than 1.0, not modified
         //Otherwise: array.tad(x,1) = array.tad(x,1) * 1.0 / array.tad(x,1).norm2()
@@ -1034,9 +1016,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(OpValidation.validate(op));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCumSum(){
 
         List<String> failing = new ArrayList<>();
@@ -1101,9 +1082,8 @@ public class MiscOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCumProd(){
         List<String> failing = new ArrayList<>();
 
@@ -1171,9 +1151,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertEquals(0, failing.size(),failing.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOneHot1(){
         List<String> failed = new ArrayList<>();
 
@@ -1203,9 +1182,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertEquals( 0, failed.size(),failed.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOneHotOp(){
         //https://www.tensorflow.org/api_docs/python/tf/one_hot
         //https://github.com/deeplearning4j/deeplearning4j/blob/master/libnd4j/include/ops/declarable/generic/parity_ops/onehot.cpp
@@ -1219,9 +1197,8 @@ public class MiscOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOneHot2(Nd4jBackend backend) {
 
         INDArray indicesArr = Nd4j.createFromArray(0, 2, -1, 1);
@@ -1241,9 +1218,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOneHot4(Nd4jBackend backend) {
 
         INDArray indicesArr = Nd4j.createFromArray(0, 2, -1, 1);
@@ -1263,9 +1239,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOneHot3(Nd4jBackend backend) {
         //https://github.com/deeplearning4j/deeplearning4j/issues/6872
 
@@ -1300,9 +1275,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLinspace(){
         SameDiff sd = SameDiff.create();
         SDVariable out = sd.linspace("linspace", DataType.DOUBLE, 1,10,10);
@@ -1315,9 +1289,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLinspace2(){
         OpValidationSuite.ignoreFailing();  //TODO 2019/01/18
         SameDiff sd = SameDiff.create();
@@ -1331,9 +1304,8 @@ public class MiscOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testShapeFn(Nd4jBackend backend) {
 
         INDArray in = Nd4j.create(new long[]{1, 2});
@@ -1347,9 +1319,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertArrayEquals(new long[]{2}, shapes.get(0).getShape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testShapeFn2(Nd4jBackend backend) {
 
         INDArray i = Nd4j.create(1,3);
@@ -1362,9 +1333,8 @@ public class MiscOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMergeRank1(){
         SameDiff sd = SameDiff.create();
         SDVariable var = sd.var("in", Nd4j.create(new long[]{1}).assign(5));
@@ -1382,9 +1352,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertEquals(1, inGrad.rank());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDiagPart(Nd4jBackend backend) {
         INDArray i = Nd4j.create(5,5);
 
@@ -1396,9 +1365,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertEquals(1, out.rank());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDiagShapeFn(Nd4jBackend backend) {
         INDArray i = Nd4j.create(5,5);
 
@@ -1411,9 +1379,8 @@ public class MiscOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testZerosOnesLike(){
         Nd4j.getRandom().setSeed(12345);
 
@@ -1455,9 +1422,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertEquals(0, failed.size(),failed.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testZerosLikeOp(){
 
         INDArray arr = Nd4j.scalar(DataType.DOUBLE, 1.0);
@@ -1472,9 +1438,8 @@ public class MiscOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConfusionMatrix(){
         DataType dt = DataType.DOUBLE;
 
@@ -1510,9 +1475,8 @@ public class MiscOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIsNonDecreasingIsStrictlyIncr(){
         List<long[]> shapes = Arrays.asList(null, new long[]{12}, new long[]{1,12}, new long[]{3,4}, new long[]{2,2,3});
 
@@ -1575,9 +1539,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertEquals( 0, failed.size(),failed.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testExtractImagePatches(){
         /*
         tf.reset_default_graph()
@@ -1624,9 +1587,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertEquals(exp, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSegmentProdBpSimple(){
 
         INDArray segmentIdxs = Nd4j.create(new double[]{0,0,0,1,2,2,3,3}, new long[]{8}).castTo(DataType.INT);
@@ -1646,9 +1608,8 @@ public class MiscOpValidation extends BaseOpValidation {
         Nd4j.getExecutioner().exec(op);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmulRank4() throws Exception {
         Nd4j.getRandom().setSeed(12345);
 
@@ -1683,9 +1644,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertEquals(outExp, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmulRank4_simple(){
 
         INDArray arr1 = Nd4j.ones(DataType.FLOAT, 32, 12, 128, 64);
@@ -1711,9 +1671,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertEquals(exp, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNthElementRank1(){
         INDArray in = Nd4j.createFromArray(new double[]{0,1,2,3,4,5,6,7,8,9});
         INDArray n = Nd4j.scalar(0);
@@ -1735,9 +1694,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertEquals(0.0, out.getDouble(0), 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTensorMmulShape(){
         INDArray a = Nd4j.create(new double[]{2}).reshape(1);
         INDArray b = Nd4j.create(new double[]{1, 2, 3, 4}).reshape(2, 1, 2);
@@ -1755,9 +1713,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertArrayEquals(new long[]{2,2}, l.get(0).getShape());         //Returning [1,2,2]
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTensorMmulShape2(){
         INDArray a = Nd4j.create(new double[]{2}).reshape(1);
         INDArray b = Nd4j.create(new double[]{1, 2, 3, 4}).reshape(2, 1, 2);
@@ -1765,9 +1722,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertArrayEquals(new long[]{2,2}, c.shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStopGradient(){
 
         SameDiff sd = SameDiff.create();
@@ -1786,9 +1742,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertEquals(Nd4j.zeros(DataType.DOUBLE, 3, 4), wArr);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCheckNumerics(){
         OpValidationSuite.ignoreFailing();  //https://github.com/eclipse/deeplearning4j/issues/7927
 
@@ -1831,9 +1786,8 @@ public class MiscOpValidation extends BaseOpValidation {
         sd.outputAll(Collections.singletonMap("in", in));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCheckNumerics2(Nd4jBackend backend) {
         INDArray in = Nd4j.rand(DataType.DOUBLE, 3, 4);
         INDArray msg = Nd4j.scalar("My error message!");
@@ -1846,9 +1800,8 @@ public class MiscOpValidation extends BaseOpValidation {
         Nd4j.getExecutioner().exec(op);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testHistogramFixedWidth(){
         //Bins: [-inf, 0.2), [0.2, 0.4), [0.4, 0.6), [0.6, 0.8), [0.8, inf]
         INDArray in = Nd4j.createFromArray(0.0, 0.1, 0.1, 0.3, 0.5, 0.5, 0.9);
@@ -1866,9 +1819,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertEquals(exp, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDynamicPartition(){
         INDArray data = Nd4j.createFromArray(2, 1, 2, 0);
         INDArray partitions = Nd4j.createFromArray(0, 2, 1, 0);
@@ -1886,9 +1838,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertEquals(exp2, out[2]);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testListDiff(){
         INDArray x = Nd4j.createFromArray(0, 1, 2, 3);
         INDArray y = Nd4j.createFromArray(3, 1);
@@ -1907,9 +1858,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertEquals(exp, outIdx);      //Indices of the values in x not in y
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDivideNoNan(Nd4jBackend backend) {
         OpValidationSuite.ignoreFailing();  //TODO: implement DivideNoNan.doDiff()
 
@@ -1933,9 +1883,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDigamma(Nd4jBackend backend) {
 
         INDArray in1 = Nd4j.linspace(1, 12, 12).reshape(3, 4);
@@ -1950,9 +1899,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFlatten(Nd4jBackend backend) {
 
         SameDiff sameDiff = SameDiff.create();
@@ -1974,9 +1922,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFusedBatchNorm(Nd4jBackend backend) {
         OpValidationSuite.ignoreFailing();
         SameDiff sameDiff = SameDiff.create();
@@ -2021,9 +1968,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIgamma(Nd4jBackend backend) {
 
         INDArray in1 = Nd4j.linspace(1, 12, 12).reshape(3, 4);
@@ -2039,9 +1985,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIgammaC(Nd4jBackend backend) {
 
         INDArray in1 = Nd4j.linspace(1, 12, 12).reshape(3, 4);
@@ -2058,9 +2003,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLgamma(Nd4jBackend backend) {
 
         SameDiff sameDiff = SameDiff.create();
@@ -2085,9 +2029,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLu(Nd4jBackend backend) {
 
         SameDiff sameDiff = SameDiff.create();
@@ -2118,9 +2061,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatrixBandPart(Nd4jBackend backend) {
         OpValidationSuite.ignoreFailing();
         SameDiff sameDiff = SameDiff.create();
@@ -2150,9 +2092,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPolygamma(Nd4jBackend backend) {
 
         INDArray in1 = Nd4j.linspace(1, 12, 12).reshape(3, 4);
@@ -2168,9 +2109,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTriangularSolve(Nd4jBackend backend) {
 
         INDArray a = Nd4j.createFromArray(new float[]{
@@ -2194,9 +2134,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBiasAdd(Nd4jBackend backend) {
 
         SameDiff sameDiff = SameDiff.create();
@@ -2225,9 +2164,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBiasAddGrad(Nd4jBackend backend) {
 
         SameDiff sameDiff = SameDiff.create();
@@ -2247,9 +2185,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRoll(Nd4jBackend backend) {
 
         INDArray x = Nd4j.createFromArray(new double[]{    11.11, 11.12, 11.21, 11.22, 11.31, 11.32, 11.41, 11.42,     12.11, 12.12, 12.21, 12.22, 12.31, 12.32, 12.41, 12.42,
@@ -2269,9 +2206,8 @@ public class MiscOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSeqMask(){
         INDArray arr = Nd4j.createFromArray(1,2,3);
         INDArray maxLen = Nd4j.scalar(4);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/RandomOpValidation.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/RandomOpValidation.java
index 0715f94fc..bb5cb8566 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/RandomOpValidation.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/RandomOpValidation.java
@@ -54,9 +54,8 @@ import static org.junit.jupiter.api.Assertions.*;
 public class RandomOpValidation extends BaseOpValidation {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRandomOpsSDVarShape(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
         List<String> failed = new ArrayList<>();
@@ -157,9 +156,8 @@ public class RandomOpValidation extends BaseOpValidation {
         assertEquals(0, failed.size(),failed.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRandomOpsLongShape(Nd4jBackend backend) {
         List<String> failed = new ArrayList<>();
 
@@ -285,9 +283,8 @@ public class RandomOpValidation extends BaseOpValidation {
         assertEquals(0, failed.size(),failed.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRandomBinomial(){
 
         INDArray z = Nd4j.create(new long[]{10});
@@ -297,9 +294,8 @@ public class RandomOpValidation extends BaseOpValidation {
         System.out.println(z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUniformRankSimple(Nd4jBackend backend) {
 
         INDArray arr = Nd4j.createFromArray(new double[]{100.0});
@@ -331,9 +327,8 @@ public class RandomOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRandomExponential(Nd4jBackend backend) {
         long length = 1_000_000;
         INDArray shape = Nd4j.createFromArray(new double[]{length});
@@ -355,9 +350,8 @@ public class RandomOpValidation extends BaseOpValidation {
         assertEquals( expStd, std, 0.1,"std");
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRange(){
         //Technically deterministic, not random...
 
@@ -390,9 +384,8 @@ public class RandomOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllEmptyReduce(){
         INDArray x = Nd4j.createFromArray(true, true, true);
         All all = new All(x);
@@ -401,9 +394,8 @@ public class RandomOpValidation extends BaseOpValidation {
         assertEquals(x, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUniformDtype(){
         Nd4j.getRandom().setSeed(12345);
         for(DataType t : new DataType[]{DataType.FLOAT, DataType.DOUBLE, }){
@@ -431,9 +423,8 @@ public class RandomOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRandomExponential2(){
         Nd4j.getRandom().setSeed(12345);
         DynamicCustomOp op = DynamicCustomOp.builder("random_exponential")
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ReductionBpOpValidation.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ReductionBpOpValidation.java
index 34e8f7c37..edf5859fa 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ReductionBpOpValidation.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ReductionBpOpValidation.java
@@ -75,9 +75,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReduceSumBP(Nd4jBackend backend) {
         //Full array reduction
 
@@ -103,9 +102,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReduceSumAlongDim0BP(Nd4jBackend backend) {
         //Reduction along dimension
         //Inputs/outputs as before - but note that the output is no longer a scalar
@@ -131,9 +129,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReduceSumAlongDim1BP(Nd4jBackend backend) {
         //Reduction along dimension
         //Inputs/outputs as before - but note that the output is no longer a scalar
@@ -161,9 +158,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMeanBP(Nd4jBackend backend) {
 
         //dL/dIn_i = dL/dOut * dOut/dIn_i = dL/dOut * (1/N * sum_j (in_j))
@@ -194,9 +190,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMeanBP_Rank1(Nd4jBackend backend) {
         INDArray dLdOut = Nd4j.scalar(0.5);
         INDArray preReduceInput = Nd4j.create(new double[]{2, 3, 4}, new long[]{3});
@@ -209,9 +204,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMeanAlongDim0BP(Nd4jBackend backend) {
         //Reduction along dimension
         //Inputs/outputs as before - but note that the output is no longer a scalar
@@ -239,9 +233,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMeanAlongDim1BP(Nd4jBackend backend) {
         //Reduction along dimension
         //Inputs/outputs as before - but note that the output is no longer a scalar
@@ -269,9 +262,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMinBP(Nd4jBackend backend) {
         //Full array min reduction
 
@@ -310,9 +302,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMinAlongDimensionBP(Nd4jBackend backend) {
         //Full array min reduction
 
@@ -355,9 +346,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMaxBP(Nd4jBackend backend) {
         //Full array max reduction
 
@@ -387,9 +377,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMaxAlongDimensionBP(Nd4jBackend backend) {
         //Full array min reduction
 
@@ -432,9 +421,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testProdBP(Nd4jBackend backend) {
         //Full array product reduction
 
@@ -463,9 +451,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testProdAlongDimensionBP(Nd4jBackend backend) {
         //dL/dIn_i  = dL/dOut * dOut/dIn_i
         //          = dL/dOut * d(prod(in))/dIn_i
@@ -521,9 +508,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStdevBP(Nd4jBackend backend) {
         //If out = stdev(in) then:
         //dL/dIn = dL/dOut * dOut/dIn
@@ -559,9 +545,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStdevBP_Rank1(Nd4jBackend backend) {
         INDArray dLdOut = Nd4j.scalar(0.5);
         INDArray preReduceInput = Nd4j.create(new double[]{2, 3, 4}, new long[]{3});
@@ -582,9 +567,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStdevAlongDimensionBP(Nd4jBackend backend) {
         //If out = stdev(in) then:
         //dL/dIn = dL/dOut * dOut/dIn
@@ -629,9 +613,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVarianceBP(Nd4jBackend backend) {
         //If out = variance(in) then:
         //dL/dIn = dL/dOut * dOut/dIn
@@ -667,9 +650,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVarianceAlongDimensionBP(Nd4jBackend backend) {
         //If out = variance(in) then:
         //dL/dIn = dL/dOut * dOut/dIn
@@ -711,9 +693,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCumSumBP(Nd4jBackend backend) {
         //Standard case, non-reverse, non-exclusive
         //dL/dIn_i  = sum_j dL/dOut_j * dOut_j/dIn_i
@@ -783,9 +764,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNorm2Bp(Nd4jBackend backend) {
         //dL/dIn = dL/dOut * dOut/dIn
         //       = dL/dOut * x/|x|_2
@@ -812,9 +792,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNorm2AlongDimensionBP(Nd4jBackend backend) {
         //dL/dIn = dL/dOut * dOut/dIn
         //       = dL/dOut * x/|x|_2
@@ -847,9 +826,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNorm1Bp(Nd4jBackend backend) {
         //dL/dIn = dL/dOut * dOut/dIn
         //       = dL/dOut * sgn(in)
@@ -876,9 +854,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNorm1AlongDimensionBP(Nd4jBackend backend) {
         //dL/dIn = dL/dOut * dOut/dIn
         //       = dL/dOut * sgn(in)
@@ -910,9 +887,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNormMaxBp(Nd4jBackend backend) {
         //out = max_i (|in_i|)
         //dL/dIn = dL/dOut * dOut/dIn
@@ -942,9 +918,8 @@ public class ReductionBpOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNormMaxAlongDimensionBP(Nd4jBackend backend) {
         //out = max_i (|in_i|)
         //dL/dIn = dL/dOut * dOut/dIn
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ReductionOpValidation.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ReductionOpValidation.java
index 6f7880a01..23e2640ee 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ReductionOpValidation.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ReductionOpValidation.java
@@ -80,9 +80,8 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class ReductionOpValidation extends BaseOpValidation {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStdev(Nd4jBackend backend) {
         List<String> errors = new ArrayList<>();
 
@@ -108,9 +107,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         assertEquals(0, errors.size(),errors.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testZeroCount(Nd4jBackend backend) {
         List<String> allFailed = new ArrayList<>();
         for (int i = 0; i < 21; i++) {
@@ -144,9 +142,8 @@ public class ReductionOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testZeroFraction(Nd4jBackend backend) {
         List<String> allFailed = new ArrayList<>();
         for (int i = 0; i < 2; i++) {
@@ -176,9 +173,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         assertEquals(0, allFailed.size(),allFailed.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReductionGradientsSimple(Nd4jBackend backend) {
         //OpValidationSuite.ignoreFailing();  //TODO TEMPORARY DUE TO CRASHES
         //Test reductions: final and only function
@@ -347,9 +343,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         assertEquals(0, failed.size(),failed.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReductionGradients1(Nd4jBackend backend) {
         //Test reductions: final, but *not* the only function
         Nd4j.getRandom().setSeed(12345);
@@ -477,9 +472,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         return Long.MAX_VALUE;
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReductionGradients2(Nd4jBackend backend) {
         //Test reductions: NON-final function
         Nd4j.getRandom().setSeed(12345);
@@ -657,9 +651,8 @@ public class ReductionOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReduce3(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -764,9 +757,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         assertEquals(0, failed.size(),"Failed: " + failed);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMoments(Nd4jBackend backend) {
         for (int[] axes : new int[][]{{0}, {1}, {0, 1}}) {
             INDArray input = Nd4j.linspace(1, 12, 12).reshape(3, 4);
@@ -798,9 +790,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMomentsOp(Nd4jBackend backend) {
         int[] axes = new int[]{0};
         INDArray input = Nd4j.linspace(1, 12, 12).reshape(3, 4);
@@ -817,9 +808,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNormalizeMomentsOp(Nd4jBackend backend) {
         INDArray data = Nd4j.linspace(1, 100, 100, DataType.DOUBLE).reshape(10, 10);
         INDArray ssSum = data.sum(0);
@@ -839,9 +829,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllAny(Nd4jBackend backend) {
 
         INDArray allZeros = Nd4j.zeros(DataType.FLOAT, 3, 4);
@@ -869,9 +858,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIndexAccum(Nd4jBackend backend) {
         List<String> failed = new ArrayList<>();
         List<int[]> dims = Arrays.asList(new int[]{0}, new int[]{1}, new int[]{0, 1} /*, new int[0]*/);
@@ -960,9 +948,8 @@ public class ReductionOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReduce3_2(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -1060,9 +1047,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReductionsBackwards(Nd4jBackend backend) {
 //        for (int i = 0; i < 7; i++) {
         int i=5;
@@ -1131,9 +1117,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDotProductAttention(){
         final INDArray keys = Nd4j.rand(new int[]{10, 4, 3});
         final INDArray values = Nd4j.rand(new int[]{10, 4, 3});
@@ -1158,9 +1143,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDotProductAttentionWithMask(){
         final INDArray keys = Nd4j.rand(new int[]{10, 4, 3});
         final INDArray values = Nd4j.rand(new int[]{10, 4, 3});
@@ -1190,9 +1174,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDotProductAttentionMultiHeadInputWithMask(){
         final INDArray keys = Nd4j.rand(new int[]{2, 5, 4, 3});
         final INDArray values = Nd4j.rand(new int[]{2, 5, 4, 3});
@@ -1223,9 +1206,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDotProductAttentionMultiHeadInput(){
         final INDArray keys = Nd4j.rand(new int[]{2, 5, 4, 3});
         final INDArray values = Nd4j.rand(new int[]{2, 5, 4, 3});
@@ -1252,9 +1234,8 @@ public class ReductionOpValidation extends BaseOpValidation {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultiHeadedDotProductAttention(){
         final INDArray k = Nd4j.rand(new int[]{10, 4, 5});
         final INDArray v = Nd4j.rand(new int[]{10, 4, 5});
@@ -1305,9 +1286,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDotProductAttentionWeirdInputs(){
         final INDArray keys = Nd4j.rand(new int[]{10, 4, 3});
         final INDArray values = Nd4j.rand(new int[]{10, 4, 3});
@@ -1344,9 +1324,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultiHeadedDotProductAttentionWeirdInputs(){
         final INDArray k = Nd4j.rand(new int[]{10, 4, 5});
         final INDArray v = Nd4j.rand(new int[]{10, 4, 5});
@@ -1403,9 +1382,8 @@ public class ReductionOpValidation extends BaseOpValidation {
             }
         }
     }
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSufficientStatisticsOp(Nd4jBackend backend) {
         INDArray data = Nd4j.createFromArray(new double[]{
                 5.5, 0.,  0.3, 5.5,1.5, 0.,  1.3, 6.5,8.6, 0.,   0., 0.4,2.5, 1.,  0.3, 4.5,1.5, 1.,
@@ -1431,9 +1409,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStandardDeviation(Nd4jBackend backend) {
 
         for (boolean keepDims : new boolean[]{false, true}) {
@@ -1460,9 +1437,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSquaredNorm(Nd4jBackend backend) {
 
         for (boolean keepDims : new boolean[]{false, true}) {
@@ -1485,9 +1461,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testShannonEntropy(Nd4jBackend backend) {
         OpValidationSuite.ignoreFailing();  //AB 2020/02/11 https://github.com/eclipse/deeplearning4j/issues/8695
 
@@ -1507,9 +1482,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEntropy(Nd4jBackend backend) {
 
         SameDiff sameDiff = SameDiff.create();
@@ -1528,9 +1502,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAMean(Nd4jBackend backend) {
 
         SameDiff sameDiff = SameDiff.create();
@@ -1551,9 +1524,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMean(Nd4jBackend backend) {
 
         SameDiff sameDiff = SameDiff.create();
@@ -1574,9 +1546,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNorm1(Nd4jBackend backend) {
 
         SameDiff sameDiff = SameDiff.create();
@@ -1597,9 +1568,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNorm2(Nd4jBackend backend) {
 
         SameDiff sameDiff = SameDiff.create();
@@ -1620,9 +1590,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNormMax(Nd4jBackend backend) {
 
         SameDiff sameDiff = SameDiff.create();
@@ -1643,9 +1612,8 @@ public class ReductionOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSoftmaxCrossEntropyWithLogitsLoss(Nd4jBackend backend) {
         OpValidationSuite.ignoreFailing();
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/RnnOpValidation.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/RnnOpValidation.java
index 3a4ef608e..97ccef82c 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/RnnOpValidation.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/RnnOpValidation.java
@@ -46,9 +46,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 @Slf4j
 public class RnnOpValidation extends BaseOpValidation {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRnnBlockCell(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
         int mb = 2;
@@ -147,9 +146,8 @@ public class RnnOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRnnBlockCellManualTFCompare(Nd4jBackend backend) {
         //Test case: "rnn/lstmblockcell/static_batch1_n3-2_tsLength1_noPH_noClip_fBias1_noIS"
 
@@ -211,9 +209,8 @@ public class RnnOpValidation extends BaseOpValidation {
         assertEquals(out6, m.get(toExec.get(6)));       //Output
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGRUCell(){
         Nd4j.getRandom().setSeed(12345);
         int mb = 2;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ShapeOpValidation.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ShapeOpValidation.java
index 38080a906..a015bfec7 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ShapeOpValidation.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/ShapeOpValidation.java
@@ -81,9 +81,8 @@ public class ShapeOpValidation extends BaseOpValidation {
     doRepeat
      */
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcat(Nd4jBackend backend) {
 //        int[] concatDim = new int[]{0,0,0,1,1,1,2,2,2};
         int[] concatDim = new int[]{0, 0, 0};
@@ -123,9 +122,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals( 0, failed.size(),failed.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReshapeGradient(Nd4jBackend backend) {
         //https://github.com/deeplearning4j/deeplearning4j/issues/6873
 
@@ -161,9 +159,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals(0, failed.size(),failed.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPermuteGradient(Nd4jBackend backend) {
         int[] origShape = new int[]{3, 4, 5};
 
@@ -201,9 +198,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals(0, failed.size(),failed.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRank(){
 
         List<long[]> inShape = Arrays.asList(null, new long[]{1}, new long[]{6}, new long[]{3,4}, new long[]{3,4,5});
@@ -230,9 +226,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testExpandDimsGradient(Nd4jBackend backend) {
         val origShape = new long[]{3, 4};
 
@@ -288,9 +283,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals(0, failed.size(),failed.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSqueezeGradient(Nd4jBackend backend) {
         val origShape = new long[]{3, 4, 5};
 
@@ -354,9 +348,8 @@ public class ShapeOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSliceGradient(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -446,9 +439,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStridedSliceGradient(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -511,9 +503,8 @@ public class ShapeOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMerge(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -680,9 +671,8 @@ public class ShapeOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUnStack(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -770,9 +760,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals( 0, failed.size(),failed.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTile(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -844,9 +833,8 @@ public class ShapeOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTileBp(){
         Nd4j.getRandom().setSeed(12345);
 
@@ -879,9 +867,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTileBp2(){
         Nd4j.getRandom().setSeed(12345);
 
@@ -915,9 +902,8 @@ public class ShapeOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReshape(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray arr = Transforms.sigmoid(Nd4j.linspace(-5, 6, 12)).reshape(3, 4);
@@ -933,9 +919,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReshape2(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
         int[] origShape = new int[]{3, 4, 5};
@@ -958,9 +943,8 @@ public class ShapeOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTranspose(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray arr = Transforms.sigmoid(Nd4j.linspace(1, 4, 4)).reshape(1,4);
@@ -972,9 +956,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTransposeOp(){
 
         INDArray arr = Nd4j.linspace(1,15, 15).reshape(5,3);
@@ -987,9 +970,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testShape(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         val shape = new long[]{2, 3};
@@ -1004,9 +986,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSize(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         val shape = new long[]{2, 3};
@@ -1020,9 +1001,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDiagShapeFn(Nd4jBackend backend) {
         INDArray i = Nd4j.linspace(1, 16, 16).reshape(4,4);
 
@@ -1036,9 +1016,8 @@ public class ShapeOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPermute(){
         INDArray in = Nd4j.linspace(1, 60, 60).reshape(3,4,5);
         INDArray exp = in.permute(0,1,2);   //No op
@@ -1052,9 +1031,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertNull(OpValidation.validate(op));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPermute2(){
         for (int[] perm : new int[][]{{0, 1, 2}, {0, 2, 1}, {1, 0, 2}, {1, 2, 0}, {2, 0, 1}, {2, 1, 0}}) {
             INDArray in = Nd4j.linspace(1, 60, 60).reshape(3,4,5);
@@ -1074,9 +1052,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConstant(){
         //OpValidationSuite.ignoreFailing();
 
@@ -1103,9 +1080,8 @@ public class ShapeOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUnstackEdgeCase2(){
         for( int i=0; i<3; i++ ) {
 
@@ -1119,9 +1095,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void invertPermutation(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -1138,9 +1113,8 @@ public class ShapeOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGatherNd(){
 
         List<INDArray> indices = new ArrayList<>();
@@ -1178,9 +1152,8 @@ public class ShapeOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReverseSequence(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         float[] input_data = new float[]{
@@ -1226,9 +1199,8 @@ public class ShapeOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatrixDeterminant(){
         OpValidationSuite.ignoreFailing();  //Gradient check failing
 
@@ -1249,9 +1221,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDeterminant22(){
         OpValidationSuite.ignoreFailing();  //Gradient check failing
 
@@ -1275,9 +1246,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatrixDeterminant3(){
         OpValidationSuite.ignoreFailing();  //Gradient checks failing
         Nd4j.getRandom().setSeed(12345);
@@ -1308,9 +1278,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatrixDeterminant4(){
         OpValidationSuite.ignoreFailing();  //Gradient checks failing
         Nd4j.getRandom().setSeed(12345);
@@ -1330,9 +1299,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSegmentOps(){
         OpValidationSuite.ignoreFailing();
         //https://github.com/deeplearning4j/deeplearning4j/issues/6952
@@ -1424,9 +1392,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals(0, failed.size(),failed.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSegmentMean(){
         INDArray x = Nd4j.linspace(DataType.FLOAT, 1, 18, 1).reshape(6, 3);
         INDArray segmentIds = Nd4j.createFromArray(0, 0, 1, 1, 2, 2);
@@ -1446,9 +1413,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals(exp, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSequenceMask(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray arr = Nd4j.createFromArray(new int[] {1, 3, 2});
@@ -1482,9 +1448,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals(expected, result2.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMeshGrid(){
         List<String> failed = new ArrayList<>();
 
@@ -1540,9 +1505,8 @@ public class ShapeOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGather(){
         List<INDArray> inArrs = new ArrayList<>();
         List<Integer> axis = new ArrayList<>();
@@ -1611,9 +1575,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGatherSimple(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray arr = Nd4j.create(new float[]{1, 2, 3, 4}, new long[]{2, 2});
@@ -1623,9 +1586,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals(expected, result.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGatherNdSingle(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray arr1 = Transforms.sigmoid(Nd4j.linspace(DataType.DOUBLE, 1, 24, 24)).reshape(2, 3, 4);
@@ -1644,9 +1606,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals(expected, result.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStack2(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray arr1 = Transforms.sigmoid(Nd4j.linspace(1, 6, 6)).reshape(3, 2);
@@ -1657,9 +1618,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertArrayEquals(new long[]{3, 2, 2}, result.eval().shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testParallelStack(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray arr1 = Transforms.sigmoid(Nd4j.linspace(1, 6, 6)).reshape(3, 2);
@@ -1671,9 +1631,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals(Nd4j.concat(0, arr1, arr2).reshape(2, 3, 2), result.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUnStack2(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray arr1 = Nd4j.zeros(3, 2);
@@ -1686,9 +1645,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals(arr2, result[1].eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPermuteSimple(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray arr = Transforms.sigmoid(Nd4j.linspace(1, 6, 6).reshape(2, 3));
@@ -1699,9 +1657,8 @@ public class ShapeOpValidation extends BaseOpValidation {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcat2(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray arr1 = Transforms.sigmoid(Nd4j.linspace(1, 4, 4)).reshape(1,4);
@@ -1712,9 +1669,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertArrayEquals(new long[]{2, 4}, result.eval().shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTile2(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray arr = Transforms.sigmoid(Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(1,4));
@@ -1727,9 +1683,8 @@ public class ShapeOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSlice2d(Nd4jBackend backend) {
         INDArray inArr = Nd4j.linspace(1, 12, 12).reshape('c', 3, 4);
 
@@ -1745,9 +1700,8 @@ public class ShapeOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSlice3d(Nd4jBackend backend) {
         INDArray inArr = Nd4j.linspace(1, 60, 60).reshape('c', 3, 4, 5);
 
@@ -1762,9 +1716,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals(inArr.get(interval(1, 3), interval(2, 4), interval(3, 4)), m.get(subPart.name()));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStridedSlice2dBasic(Nd4jBackend backend) {
         INDArray inArr = Nd4j.linspace(1, 12, 12).reshape('c', 3, 4);
 
@@ -1782,9 +1735,8 @@ public class ShapeOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStridedSliceBeginEndMask(Nd4jBackend backend) {
         INDArray inArr = Nd4j.linspace(1, 12, 12).reshape('c', 3, 4);
 
@@ -1799,9 +1751,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals(inArr.get(NDArrayIndex.interval(1, 3), NDArrayIndex.all()), slice2.getArr());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStridedSliceEllipsisMask(Nd4jBackend backend) {
         INDArray inArr = Nd4j.linspace(1, 60, 60).reshape('c', 3, 4, 5);
         SameDiff sd = SameDiff.create();
@@ -1818,9 +1769,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals(inArr.get(interval(1, 3), all(), all()), slice2.getArr());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStridedSliceNewAxisMask(Nd4jBackend backend) {
         INDArray inArr = Nd4j.linspace(1, 60, 60).reshape('c', 3, 4, 5);
         SameDiff sd = SameDiff.create();
@@ -1833,9 +1783,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals(inArr, out.get(point(0), all(), all(), all()));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStridedSliceNewAxisMask2(Nd4jBackend backend) {
         INDArray inArr = Nd4j.linspace(1, 60, 60).reshape('c', 3, 4, 5);
         SameDiff sd = SameDiff.create();
@@ -1846,9 +1795,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertArrayEquals(new long[]{2, 2, 1, 3}, slice.getArr().shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStridedSliceShrinkAxisMask(Nd4jBackend backend) {
 
         INDArray inArr = Nd4j.linspace(1, 60, 60).reshape('c', 3, 4, 5);
@@ -1865,9 +1813,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals(inArr.get(point(1), point(2), interval(1, 5)).reshape(4), slice3.getArr());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSizeAt_1(Nd4jBackend backend) {
         val array = Nd4j.create(10, 20, 30);
         val exp = Nd4j.scalar(DataType.LONG, 20);
@@ -1881,9 +1828,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals(exp, output);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEye(){
         int[] rows = new int[]{3,3,3,3};
         int[] cols = new int[]{3,2,2,2};
@@ -1921,9 +1867,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSplit1(){
         INDArray in = Nd4j.linspace(1,10,10).reshape(10);
         INDArray axis = Nd4j.scalar(-1);
@@ -1941,9 +1886,8 @@ public class ShapeOpValidation extends BaseOpValidation {
                 .build()).expectedOutput(0, exp1).expectedOutput(1,exp2)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSplit2(){
         INDArray in = Nd4j.linspace(1,24,24).reshape(3,8);
         INDArray axis = Nd4j.scalar(-1);
@@ -1961,9 +1905,8 @@ public class ShapeOpValidation extends BaseOpValidation {
                 .build()).expectedOutput(0, exp1).expectedOutput(1,exp2)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDistancesExec(){
         //https://github.com/deeplearning4j/deeplearning4j/issues/7001
         for(String s : new String[]{"euclidean", "manhattan", "cosinesim", "cosinedist", "jaccard"}) {
@@ -2018,9 +1961,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReductionShape(){
 
         INDArray shape = Nd4j.createFromArray(4,2);
@@ -2038,9 +1980,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertArrayEquals(exp, s);  //Fails - actual shape [1]
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void gatherTest(){
         INDArray in = Nd4j.createFromArray(new double[][]{
                 {1,2,3,4,5},
@@ -2059,9 +2000,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertArrayEquals(expShape, shape);     //Fails: actual shape: [5]
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSliceShape(){
 
         INDArray arr = Nd4j.arange(0, 25).reshape(1,5,5).castTo(DataType.INT);
@@ -2082,9 +2022,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertArrayEquals(shapeExp, shape);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWhereAllFalse(){
         INDArray in = Nd4j.create(DataType.BOOL, 1917);
         DynamicCustomOp op = DynamicCustomOp.builder("Where")
@@ -2098,9 +2037,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertTrue(isEmpty);    //Not empty, but should be
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGatherScalar(){
         INDArray in = Nd4j.linspace(100, 200, 100, DataType.FLOAT).reshape(100);
         INDArray indices = Nd4j.scalar(0);
@@ -2124,9 +2062,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals(exp, arr);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCastEmpty(){
         INDArray emptyLong = Nd4j.empty(DataType.LONG);
         int dtype = 9;  //INT = 9 - https://github.com/eclipse/deeplearning4j/blob/master/libnd4j/include/array/DataType.h
@@ -2142,9 +2079,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertTrue(isEmpty);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGatherEmpty(){
         /*
         tf.reset_default_graph()
@@ -2176,9 +2112,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertTrue(isEmpty);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSplitEmpty(){
         /*
         tf.reset_default_graph()
@@ -2215,9 +2150,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         Nd4j.exec(op);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcatEmpty(){
         /*
         TF behaviour with concatenatioun of empty arrays:
@@ -2266,9 +2200,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         Nd4j.exec(op);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcatEmpty2(){
         INDArray empty10a = Nd4j.create(DataType.INT, 1, 0);
         INDArray empty10b = Nd4j.create(DataType.INT, 1, 0);
@@ -2300,9 +2233,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         Nd4j.exec(op);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyGather(){
         /*
         tf.reset_default_graph()
@@ -2334,9 +2266,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         op.addOutputArgument(out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastDynamicShape1(){
 
         //Test case: [2,1] and [4]: expect [2,4]
@@ -2357,9 +2288,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals(Nd4j.createFromArray(new int[]{2,4}), out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastDynamicShape2(){
 
         //Test case: [2,1,4] and [2,2,4]: expect [2,2,4]
@@ -2381,9 +2311,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals(Nd4j.createFromArray(new int[]{2,4,3}), out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStridedSliceShrinkAxis(){
         INDArray in = Nd4j.create(DataType.DOUBLE, 3,2,2);
         INDArray begin = Nd4j.createFromArray(2);
@@ -2408,9 +2337,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertArrayEquals(exp, shape);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStridedSliceEmpty(){
 
         INDArray in = Nd4j.createFromArray(10); //Integer, Length 1, rank 1, value 10   - Not used due to begin mask!
@@ -2432,9 +2360,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertTrue(isEmpty);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStridedSliceEdgeCase(){
         INDArray in = Nd4j.scalar(10).reshape(1);   //Int [1]
         INDArray begin = Nd4j.ones(DataType.INT, 1);
@@ -2459,9 +2386,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         Nd4j.exec(op);  //Execution is OK
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptySlice1(){
         INDArray in = Nd4j.createFromArray(38);
         INDArray begin = Nd4j.createFromArray(1);
@@ -2480,9 +2406,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         Nd4j.exec(op);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptySlice2(){
         INDArray in = Nd4j.createFromArray(38);
         INDArray begin = Nd4j.createFromArray(0);
@@ -2501,9 +2426,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         Nd4j.exec(op);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFill(){
 
         INDArray shape = Nd4j.createFromArray(0,4);
@@ -2522,9 +2446,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         Nd4j.exec(op);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFill2(){
 
         INDArray shape = Nd4j.createFromArray(0,4);
@@ -2541,9 +2464,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         Nd4j.exec(op);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPermuteShapeDynamicAxis(){
 
         DynamicCustomOp op = DynamicCustomOp.builder("permute")
@@ -2572,9 +2494,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertArrayEquals(new long[]{4, 5, 3}, l.get(0).getShape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGather2(){
         SameDiff sd = SameDiff.create();
         SDVariable input = sd.var("in", Nd4j.arange(6).castTo(DataType.FLOAT).reshape(2,3));
@@ -2593,9 +2514,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPermute3(){
         INDArray in = Nd4j.linspace(DataType.FLOAT, 1, 6, 1).reshape(3,2);
         INDArray permute = Nd4j.createFromArray(1,0);
@@ -2613,9 +2533,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertEquals(exp, outArr);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPermute4(){
         INDArray in = Nd4j.linspace(DataType.FLOAT, 1, 6, 1).reshape(3,2);
         INDArray permute = Nd4j.createFromArray(1,0);
@@ -2645,18 +2564,16 @@ public class ShapeOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInvertPermutation(){
         DynamicCustomOp op = DynamicCustomOp.builder("invert_permutation")
                 .addInputs(Nd4j.createFromArray(1, 0))
                 .build();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastInt1(Nd4jBackend backend) {
 
         INDArray out = Nd4j.create(DataType.INT, 1);
@@ -2669,9 +2586,8 @@ public class ShapeOpValidation extends BaseOpValidation {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastInt2(){
         INDArray out = Nd4j.create(DataType.INT, 2);
         DynamicCustomOp op = DynamicCustomOp.builder("broadcast_dynamic_shape")
@@ -2710,9 +2626,8 @@ public class ShapeOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMergeMaxIndex(Nd4jBackend backend) {
 
         Nd4j.getRandom().setSeed(12345);
@@ -2729,9 +2644,8 @@ public class ShapeOpValidation extends BaseOpValidation {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTriOp(Nd4jBackend backend) {
 
         SameDiff sd = SameDiff.create();
@@ -2743,9 +2657,8 @@ public class ShapeOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTriuOp(Nd4jBackend backend) {
 
         SameDiff sd = SameDiff.create();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/TransformOpValidation.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/TransformOpValidation.java
index c1464063c..7c0d1db1a 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/TransformOpValidation.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/opvalidation/TransformOpValidation.java
@@ -118,9 +118,8 @@ public class TransformOpValidation extends BaseOpValidation {
         NativeOpsHolder.getInstance().getDeviceNativeOps().enableVerboseMode(false);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarOps(Nd4jBackend backend) {
         int d0 = 2;
         int d1 = 3;
@@ -217,9 +216,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertEquals(0, failed.size(),failed.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarMulCF(Nd4jBackend backend) {
 
         INDArray in = Nd4j.linspace(1, 12, 12, DataType.DOUBLE).reshape('c', 3, 4);
@@ -233,9 +231,8 @@ public class TransformOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarMulCF2(Nd4jBackend backend) {
 
         INDArray in = Nd4j.linspace(1, 12, 12, DataType.DOUBLE).reshape('c', 3, 4);
@@ -246,9 +243,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertEquals(outC, outF);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCross(Nd4jBackend backend) {
         INDArray a = Nd4j.create(new double[]{4, 2, 1}, new int[]{1, 3});
         INDArray b = Nd4j.create(new double[]{1, 3, 4}, new int[]{1, 3});
@@ -276,9 +272,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertNull(err, err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSpaceToDepth(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(1337);
 
@@ -306,9 +301,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDepthToSpace(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(1337);
 
@@ -335,9 +329,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertNull(err, err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBatchToSpace(Nd4jBackend backend) {
         //OpValidationSuite.ignoreFailing();          //TODO: https://github.com/eclipse/deeplearning4j/issues/6863
         Nd4j.getRandom().setSeed(1337);
@@ -374,9 +367,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertNull(err, err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSpaceToBatch(Nd4jBackend backend) {
         //OpValidationSuite.ignoreFailing();          //TODO: https://github.com/eclipse/deeplearning4j/issues/6863
 
@@ -414,9 +406,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertNull(err, err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDynamicPartition(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -456,9 +447,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDynamicPartition2(Nd4jBackend backend) {
         INDArray data = Nd4j.createFromArray(2, 1, 2, 0);
         INDArray partitions = Nd4j.createFromArray(0, 2, 1, 0);
@@ -476,9 +466,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertEquals(exp2, out[2]);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDynamicStitch(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -515,9 +504,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDiag(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -543,9 +531,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDiagPart(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -564,9 +551,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEye(Nd4jBackend backend) {
         int[] rows = new int[]{3, 3, 3, 3};
         int[] cols = new int[]{3, 2, 2, 2};
@@ -600,9 +586,8 @@ public class TransformOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEyeShape(Nd4jBackend backend) {
         DynamicCustomOp dco = DynamicCustomOp.builder("eye")
                 .addIntegerArguments(3, 3)
@@ -614,9 +599,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertArrayEquals(new long[]{3, 3}, list.get(0).getShape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTransforms(Nd4jBackend backend) {
         //Test transforms (non-pairwise)
         Nd4j.getRandom().setSeed(12345);
@@ -1104,9 +1088,8 @@ public class TransformOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPairwiseTransforms(Nd4jBackend backend) {
         /*
         add, sub, mul, div, rsub, rdiv
@@ -1290,9 +1273,8 @@ public class TransformOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIsX(Nd4jBackend backend) {
         List<String> failed = new ArrayList<>();
 
@@ -1347,9 +1329,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertEquals(0, failed.size(),failed.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReplaceWhereScalar(Nd4jBackend backend) {
         for (Condition c : new Condition[]{Conditions.lessThan(0.5), Conditions.greaterThan(0.5), Conditions.equals(0.5)}) {
 
@@ -1371,9 +1352,8 @@ public class TransformOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReplaceWhereArray(Nd4jBackend backend) {
         for (Condition c : new Condition[]{Conditions.lessThan(0.5), Conditions.greaterThan(0.5), Conditions.equals(0.5)}) {
 
@@ -1396,9 +1376,8 @@ public class TransformOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLogGrad(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         SDVariable input = sameDiff.var("x", Nd4j.linspace(1, 4, 4, DataType.DOUBLE));
@@ -1409,9 +1388,8 @@ public class TransformOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSigmoidBackwards(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray sumInput = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
@@ -1429,9 +1407,8 @@ public class TransformOpValidation extends BaseOpValidation {
     }
 
 
-/*      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+/*      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDepth(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         SDVariable x = sameDiff.one("one",new long[]{2,2});
@@ -1440,9 +1417,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertEquals(1,sigmoid.depth());
     }*/
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRank0EdgeCase(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable v1 = sd.sum(sd.var(Nd4j.create(new double[]{4, 4})));
@@ -1455,9 +1431,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertEquals(4, d1, 0);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAtan2BroadcastShape(Nd4jBackend backend) {
         INDArray arr1 = Nd4j.create(new long[]{3, 1, 4});
         INDArray arr2 = Nd4j.create(new long[]{1, 2, 4});
@@ -1472,9 +1447,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertArrayEquals(new long[]{3, 2, 4}, outShapes.get(0).getShape(),Arrays.toString(outShapes.get(0).getShape()));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBooleanAnd(Nd4jBackend backend) {
         Nd4j.setDataType(DataType.FLOAT);
         INDArray arr1 = Nd4j.create(new long[]{3, 4});
@@ -1488,9 +1462,8 @@ public class TransformOpValidation extends BaseOpValidation {
         Nd4j.getExecutioner().exec(op);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScatterOpsScalar(Nd4jBackend backend) {
         for (String s : new String[]{"add", "sub", "mul", "div"}) {
             INDArray ref = Nd4j.linspace(1, 30, 30, DataType.DOUBLE).reshape(10, 3);
@@ -1535,9 +1508,8 @@ public class TransformOpValidation extends BaseOpValidation {
 
 
     @Disabled("12/16/2019 https://github.com/eclipse/deeplearning4j/issues/8540")
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPad(Nd4jBackend backend) {
         INDArray in = Nd4j.valueArrayOf(new long[]{5}, 1.0);
         INDArray pad = Nd4j.create(new double[]{1, 1}, new long[]{1, 2}).castTo(DataType.LONG);
@@ -1564,9 +1536,8 @@ public class TransformOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMirrorPad(Nd4jBackend backend) {
         INDArray in = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(2, 3);
         INDArray pad = Nd4j.create(new double[][]{{1, 1}, {2, 2}}).castTo(DataType.INT);
@@ -1599,9 +1570,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertNull(err2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMirrorPad2(Nd4jBackend backend) {
         INDArray in = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(2, 3);
         INDArray pad = Nd4j.create(new double[][]{{1, 1}, {2, 2}}).castTo(DataType.INT);
@@ -1627,9 +1597,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMirrorPadSymmetric(Nd4jBackend backend) {
         INDArray in = Nd4j.linspace(1, 12, 12, DataType.DOUBLE).reshape(3, 4);
         INDArray pad = Nd4j.create(new double[][]{{1, 1}, {1, 1}}).castTo(DataType.INT);
@@ -1656,9 +1625,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUnique(Nd4jBackend backend) {
         INDArray in = Nd4j.create(new double[]{3, 4, 3, 1, 3, 0, 2, 4, 2, 4});
 
@@ -1680,9 +1648,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTopK(Nd4jBackend backend) {
         OpValidationSuite.ignoreFailing();  //Can't assume sorted here
         INDArray in = Nd4j.create(new double[]{7, 3, 1, 2, 5, 0, 4, 6, 9, 8});
@@ -1711,9 +1678,8 @@ public class TransformOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTopK1(Nd4jBackend backend) {
         INDArray x = Nd4j.createFromArray(0.0, 0.0, 0.0, 10.0, 0.0);
         INDArray k = Nd4j.scalar(1);
@@ -1734,9 +1700,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertEquals(expIdx, outIdx);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInTopK(Nd4jBackend backend) {
         for (int k = 4; k >= 1; k--) {
             log.info("Testing: k=" + k);
@@ -1777,9 +1742,8 @@ public class TransformOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testZeta(Nd4jBackend backend) {
         OpValidationSuite.ignoreFailing();  //https://github.com/deeplearning4j/deeplearning4j/issues/6182
         INDArray x = Nd4j.rand(3, 4).addi(1.0);
@@ -1796,9 +1760,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertNotEquals(Nd4j.create(out.shape()), out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMaxEmptyScalar(Nd4jBackend backend) {
         INDArray empty = Nd4j.empty(DataType.FLOAT);
         INDArray scalar = Nd4j.scalar(1.0f);
@@ -1815,9 +1778,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertTrue(isEmpty);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastEmpty(Nd4jBackend backend) {
 //        Nd4j.getExecutioner().enableVerboseMode(true);
 //        Nd4j.getExecutioner().enableDebugMode(true);
@@ -1907,9 +1869,8 @@ public class TransformOpValidation extends BaseOpValidation {
         return false;
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStandardize(Nd4jBackend backend) {
         final INDArray random = Nd4j.rand(new int[]{10, 4});
 
@@ -1930,9 +1891,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertNull(err, err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStandardizeOP(Nd4jBackend backend) {
         final INDArray random = Nd4j.rand(new int[]{10, 4});
 
@@ -1947,9 +1907,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertEquals(res, output);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStandardizeNoDeviation(Nd4jBackend backend) {
         final INDArray random = Nd4j.rand(new int[]{10, 4});
         for (int i = 0; i < 4; i++) {
@@ -1975,9 +1934,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertNull(err, err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatMulTensor(Nd4jBackend backend) {
         final INDArray a = Nd4j.rand(new int[]{1, 2, 3, 4, 5});
         final INDArray b = Nd4j.rand(new int[]{1, 2, 3, 5, 6});
@@ -1997,9 +1955,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertNull(err, err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatMulTensorTranspose(Nd4jBackend backend) {
         for (boolean transposeA : new boolean[]{false, true}) {
             for (boolean transposeB : new boolean[]{false, true}) {
@@ -2092,9 +2049,8 @@ public class TransformOpValidation extends BaseOpValidation {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSoftmaxCF(Nd4jBackend backend) {
 
         INDArray arrC = Nd4j.rand(DataType.FLOAT, 2, 5);
@@ -2115,9 +2071,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertEquals(outCC, outFF);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLogSumExp(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
         INDArray inputArr = Nd4j.rand(DataType.FLOAT, 1, 4);
@@ -2132,9 +2087,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertEquals(log, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLogSumExp2(Nd4jBackend backend) {
 
         for (int dim = 0; dim <= 2; dim++) {
@@ -2155,9 +2109,8 @@ public class TransformOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCRELU(Nd4jBackend backend) {
 
         Nd4j.getRandom().setSeed(12345);
@@ -2176,9 +2129,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testClipByAvgNorm(Nd4jBackend backend) {
 
         Nd4j.getRandom().setSeed(12345);
@@ -2199,9 +2151,8 @@ public class TransformOpValidation extends BaseOpValidation {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmbeddingLookup(Nd4jBackend backend) {
 
         Nd4j.getRandom().setSeed(12345);
@@ -2214,9 +2165,8 @@ public class TransformOpValidation extends BaseOpValidation {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testImageResize(Nd4jBackend backend) {
 
         //TODO: Methods failed ResizeLanczos5, ResizeMitchelcubic, ResizeArea
@@ -2258,9 +2208,8 @@ public class TransformOpValidation extends BaseOpValidation {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMaximumBp(Nd4jBackend backend) {
 
         Nd4j.getRandom().setSeed(12345);
@@ -2277,9 +2226,8 @@ public class TransformOpValidation extends BaseOpValidation {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMergeAddBp(Nd4jBackend backend) {
 
         Nd4j.getRandom().setSeed(12345);
@@ -2296,9 +2244,8 @@ public class TransformOpValidation extends BaseOpValidation {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMergeMaxBp(Nd4jBackend backend) {
 
         Nd4j.getRandom().setSeed(12345);
@@ -2316,9 +2263,8 @@ public class TransformOpValidation extends BaseOpValidation {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMergeAvgBp(Nd4jBackend backend) {
 
         Nd4j.getRandom().setSeed(12345);
@@ -2335,9 +2281,8 @@ public class TransformOpValidation extends BaseOpValidation {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReverseBp(Nd4jBackend backend) {
 
         Nd4j.getRandom().setSeed(12345);
@@ -2351,9 +2296,8 @@ public class TransformOpValidation extends BaseOpValidation {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUpsampling3dBp(Nd4jBackend backend) {
 
         Nd4j.getRandom().setSeed(12345);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/ConvConfigTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/ConvConfigTests.java
index 19e16b00e..70a0ef950 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/ConvConfigTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/ConvConfigTests.java
@@ -45,9 +45,8 @@ public class ConvConfigTests extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDeConv2D(Nd4jBackend backend){
         DeConv2DConfig.builder().kH(2).kW(4).build();
 
@@ -108,9 +107,8 @@ public class ConvConfigTests extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConv2D(Nd4jBackend backend){
         Conv2DConfig.builder().kH(2).kW(4).build();
 
@@ -171,9 +169,8 @@ public class ConvConfigTests extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPooling2D(Nd4jBackend backend){
         Pooling2DConfig.builder().kH(2).kW(4).build();
 
@@ -234,9 +231,8 @@ public class ConvConfigTests extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDeConv3D(Nd4jBackend backend){
         DeConv3DConfig.builder().kH(2).kW(4).kD(3).build();
 
@@ -325,9 +321,8 @@ public class ConvConfigTests extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConv3D(Nd4jBackend backend){
         Conv3DConfig.builder().kH(2).kW(4).kD(3).build();
 
@@ -418,9 +413,8 @@ public class ConvConfigTests extends BaseNd4jTestWithBackends {
 
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPooling3D(Nd4jBackend backend){
         Pooling3DConfig.builder().kH(2).kW(4).kD(3).build();
 
@@ -509,9 +503,8 @@ public class ConvConfigTests extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConv1D(){
         Conv1DConfig.builder().k(2).paddingMode(PaddingMode.SAME).build();
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/FailingSameDiffTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/FailingSameDiffTests.java
index 9b3c3c2e9..273d2e9d3 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/FailingSameDiffTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/FailingSameDiffTests.java
@@ -50,9 +50,8 @@ public class FailingSameDiffTests extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEye(Nd4jBackend backend){
         //OpValidationSuite.ignoreFailing();
         INDArray arr = Nd4j.create(new double[]{1, 0, 0, 0, 1, 0}, new int[]{2, 3});
@@ -68,9 +67,8 @@ public class FailingSameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(expOut, result.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEyeShape(Nd4jBackend backend){
         val dco = DynamicCustomOp.builder("eye")
                 .addIntegerArguments(3,3)
@@ -82,9 +80,8 @@ public class FailingSameDiffTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{3,3}, list.get(0).getShape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testExecutionDifferentShapesTransform(Nd4jBackend backend){
         OpValidationSuite.ignoreFailing();
         SameDiff sd = SameDiff.create();
@@ -105,9 +102,8 @@ public class FailingSameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, out2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDropout(Nd4jBackend backend) {
         OpValidationSuite.ignoreFailing();
         SameDiff sd = SameDiff.create();
@@ -120,9 +116,8 @@ public class FailingSameDiffTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{2, 2}, res.getShape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testExecutionDifferentShapesDynamicCustom(Nd4jBackend backend){
         OpValidationSuite.ignoreFailing();
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/FlatBufferSerdeTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/FlatBufferSerdeTest.java
index 2a2d11ef2..4ff306796 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/FlatBufferSerdeTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/FlatBufferSerdeTest.java
@@ -67,9 +67,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import static junit.framework.TestCase.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 @Slf4j
 public class FlatBufferSerdeTest extends BaseNd4jTestWithBackends {
@@ -82,9 +80,8 @@ public class FlatBufferSerdeTest extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasic(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         SameDiff sd = SameDiff.create();
         INDArray arr = Nd4j.linspace(1,12,12).reshape(3,4);
@@ -139,9 +136,8 @@ public class FlatBufferSerdeTest extends BaseNd4jTestWithBackends {
         assertEquals(sd.getLossVariables().size(), fg.lossVariablesLength());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSimple(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         for( int i = 0; i < 10; i++ ) {
             for(boolean execFirst : new boolean[]{false, true}) {
@@ -270,9 +266,8 @@ public class FlatBufferSerdeTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTrainingSerde(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
 
         //Ensure 2 things:
@@ -356,9 +351,8 @@ public class FlatBufferSerdeTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void pooling3DSerialization(Nd4jBackend backend){
         SameDiff sd = SameDiff.create();
 
@@ -378,9 +372,8 @@ public class FlatBufferSerdeTest extends BaseNd4jTestWithBackends {
                 deserialized.getVariableOutputOp("pool").getClass());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void pooling3DSerialization2(Nd4jBackend backend){
         SameDiff sd = SameDiff.create();
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/GraphTransformUtilTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/GraphTransformUtilTests.java
index e804e95c4..5aba28584 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/GraphTransformUtilTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/GraphTransformUtilTests.java
@@ -52,9 +52,8 @@ public class GraphTransformUtilTests extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasic(Nd4jBackend backend){
 
         SameDiff sd = SameDiff.create();
@@ -93,9 +92,8 @@ public class GraphTransformUtilTests extends BaseNd4jTestWithBackends {
         assertEquals(0, sg2.getChildNodes().size());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSubgraphReplace1(Nd4jBackend backend){
 
         SameDiff sd = SameDiff.create();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/MemoryMgrTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/MemoryMgrTest.java
index cd57673e6..0f09e4632 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/MemoryMgrTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/MemoryMgrTest.java
@@ -42,9 +42,8 @@ public class MemoryMgrTest extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArrayReuseTooLarge(Nd4jBackend backend) throws Exception {
 
         ArrayCacheMemoryMgr mmgr = new ArrayCacheMemoryMgr();
@@ -116,9 +115,8 @@ public class MemoryMgrTest extends BaseNd4jTestWithBackends {
         assertEquals(0, mmgr.getLruCacheValues().size());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testManyArrays(Nd4jBackend backend){
 
         ArrayCacheMemoryMgr mmgr = new ArrayCacheMemoryMgr();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/NameScopeTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/NameScopeTests.java
index a6af53988..c2724b585 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/NameScopeTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/NameScopeTests.java
@@ -45,9 +45,8 @@ public class NameScopeTests extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVariableNameScopesBasic(Nd4jBackend backend) {
 
         SameDiff sd = SameDiff.create();
@@ -73,9 +72,8 @@ public class NameScopeTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOpFieldsAndNames(Nd4jBackend backend) {
 
         SameDiff sd = SameDiff.create();
@@ -153,9 +151,8 @@ public class NameScopeTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNoNesting(Nd4jBackend backend) {
         SameDiff SD = SameDiff.create();
 
@@ -172,9 +169,8 @@ public class NameScopeTests extends BaseNd4jTestWithBackends {
         assertTrue(SD.variableMap().containsKey("test/argmax"),"Var with name test/argmax exists");
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNoTesting2(Nd4jBackend backend) {
         SameDiff SD = SameDiff.create();
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffMultiThreadTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffMultiThreadTests.java
index c13229451..7d44be585 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffMultiThreadTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffMultiThreadTests.java
@@ -49,9 +49,8 @@ public class SameDiffMultiThreadTests extends BaseND4JTest {
         return Long.MAX_VALUE;
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSimple(Nd4jBackend backend) throws Exception {
 
         int nThreads = 4;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffOutputTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffOutputTest.java
index 2bd6d0d8c..725b7b794 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffOutputTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffOutputTest.java
@@ -36,9 +36,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 public class SameDiffOutputTest extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void outputTest(Nd4jBackend backend){
         DataSet data = new DataSet(Nd4j.zeros(10, 10), Nd4j.zeros(10, 10));
         SameDiff sd = SameDiff.create();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffSpecifiedLossVarsTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffSpecifiedLossVarsTests.java
index 1ca6bbceb..7adeeb4ec 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffSpecifiedLossVarsTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffSpecifiedLossVarsTests.java
@@ -33,8 +33,6 @@ import org.nd4j.linalg.factory.Nd4j;
 import org.nd4j.linalg.factory.Nd4jBackend;
 import org.nd4j.linalg.learning.config.Adam;
 
-import static junit.framework.TestCase.assertNotNull;
-import static junit.framework.TestCase.assertNull;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class SameDiffSpecifiedLossVarsTests extends BaseNd4jTestWithBackends {
@@ -45,9 +43,8 @@ public class SameDiffSpecifiedLossVarsTests extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSpecifiedLoss1(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable ph1 = sd.var("ph", DataType.FLOAT, 3, 4);
@@ -68,11 +65,10 @@ public class SameDiffSpecifiedLossVarsTests extends BaseNd4jTestWithBackends {
         assertNotNull(ph1.gradient());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSpecifiedLoss2(Nd4jBackend backend) {
-        for( int i=0; i<2; i++ ) {
+        for( int i = 0; i < 2; i++) {
             SameDiff sd = SameDiff.create();
             SDVariable ph = sd.placeHolder("ph", DataType.FLOAT, 3, 4);
             SDVariable w = sd.var("w", Nd4j.rand(DataType.FLOAT, 4, 5));
@@ -111,7 +107,7 @@ public class SameDiffSpecifiedLossVarsTests extends BaseNd4jTestWithBackends {
 
             for(String s : new String[]{"w", "b", badd.name(), add.name(), "l1", "l2"}){
                 SDVariable gradVar = sd.getVariable(s).gradient();
-                assertNotNull(s, gradVar);
+                assertNotNull(gradVar,s);
             }
             //Unused:
             assertFalse(shape.hasGradient());
@@ -123,9 +119,8 @@ public class SameDiffSpecifiedLossVarsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTrainingDifferentLosses(Nd4jBackend backend) {
         //Net with 2 losses: train on the first one, then change losses
         //Also check that if modifying via add/setLossVariables the training config changes
@@ -154,20 +149,20 @@ public class SameDiffSpecifiedLossVarsTests extends BaseNd4jTestWithBackends {
         sd.setLossVariables("loss1");
         sd.createGradFunction();
         for(SDVariable v : new SDVariable[]{ph1, w1, b1, mmul1, badd1, loss1}){
-            assertNotNull(v.name(), v.gradient());
+            assertNotNull(v.gradient(),v.name());
         }
         for(SDVariable v : new SDVariable[]{ph2, w2, b2, mmul2, badd2, loss2}){
-            assertNull(v.name(), v.gradient());
+            assertNull(v.gradient(),v.name());
         }
 
         //Now, set to other loss function
         sd.setLossVariables("loss2");
         sd.createGradFunction();
         for(SDVariable v : new SDVariable[]{ph1, w1, b1, mmul1, badd1, loss1}){
-            assertNull(v.name(), v.gradient());
+            assertNull(v.gradient(),v.name());
         }
         for(SDVariable v : new SDVariable[]{ph2, w2, b2, mmul2, badd2, loss2}){
-            assertNotNull(v.name(), v.gradient());
+            assertNotNull(v.gradient(),v.name());
         }
 
         //Train the first side of the graph. The other side should remain unmodified!
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffTests.java
index 3941b6cea..4d8dc2398 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffTests.java
@@ -21,7 +21,7 @@
 package org.nd4j.autodiff.samediff;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.Assume.assumeNotNull;
+import static org.junit.jupiter.api.Assumptions.*;
 import static org.nd4j.linalg.indexing.NDArrayIndex.all;
 
 import com.google.common.collect.Maps;
@@ -144,9 +144,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         return inputMap;
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVariableNaming_1(Nd4jBackend backend) {
         val sd = SameDiff.create();
 
@@ -163,17 +162,15 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAddArgsAndOutput(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         val varOne = sameDiff.var("one", Nd4j.ones(2));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMseBackwards(Nd4jBackend backend) {
 
         SameDiff sd = SameDiff.create();
@@ -200,9 +197,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         sd.calculateGradients(Collections.emptyMap(), sd.getVariables().keySet());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvalVariable(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray ones = Nd4j.ones(4);
@@ -213,9 +209,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSum(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray arr = Transforms.sigmoid(Nd4j.linspace(1, 4, 4, DataType.FLOAT)).reshape(1, 4);
@@ -227,9 +222,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, resultArr);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAddEval(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray x = Nd4j.scalar(1.0);
@@ -245,9 +239,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(outputAssertion, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWeightedXentWithLogits(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray targets = Nd4j.create(new long[]{1, 5});
@@ -264,9 +257,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{1, 5}, resultArray.shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMseForward(Nd4jBackend backend) {
 
         SameDiff sd = SameDiff.create();
@@ -292,9 +284,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(1, result.length());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDistance(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray arr = Transforms.sigmoid(Nd4j.linspace(1, 4, 4)).reshape(2, 2);
@@ -307,9 +298,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{1, 2}, out.get(finalReshape.name()).shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTensorGradMmul(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray arr = Transforms.sigmoid(Nd4j.linspace(1, 4, 4)).reshape(2, 2);
@@ -322,9 +312,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEval(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray arr = Nd4j.linspace(1, 4, 4);
@@ -335,9 +324,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(assertion, eval);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFunctionInputsAndArgs(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         SDVariable var = sameDiff.var("one", Nd4j.scalar(1.0));
@@ -348,9 +336,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCrossSameDiffVariableInitWithAlloc(Nd4jBackend backend) {
         SameDiff first = SameDiff.create();
         SameDiff second = SameDiff.create();
@@ -362,36 +349,33 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCrossSameDiffVariableInitWithPlaceHolder(Nd4jBackend backend) {
         SameDiff first = SameDiff.create();
         SameDiff second = SameDiff.create();
 
         SDVariable firstVar = first.var("one", new long[]{2, 2});
         SDVariable secondVar = second.var(firstVar);
-        assumeNotNull(firstVar.getArr());
+        assertNotNull(firstVar.getArr());
 
         assertEquals(firstVar.getArr(), secondVar.getArr());
         assertEquals(firstVar.name(), secondVar.name());
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVariableArrayReference(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         SDVariable arr = sameDiff.var("one", new long[]{2, 2});
         assertArrayEquals(new long[]{2, 2}, arr.getShape());
-        assumeNotNull(arr.getArr());
+        assertNotNull(arr.getArr());
         assertArrayEquals(new long[]{2, 2}, arr.getArr().shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvalAddSelf(Nd4jBackend backend) {
         /**
          * Note this test fails yet due to needing
@@ -407,9 +391,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(assertion, eval);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvalAdd(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray arr = Nd4j.linspace(1, 4, 4);
@@ -426,9 +409,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(assertion, eval);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDup(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray arr = Transforms.sigmoid(Nd4j.linspace(1, 8, 8)).reshape(2, 2, 2);
@@ -438,9 +420,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testElementWiseDivAndRDiv(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray ones = Nd4j.ones(4);
@@ -468,9 +449,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNegativeGradient(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray ones = Nd4j.ones(4);
@@ -487,9 +467,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSumOp(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray sumInput = Nd4j.linspace(1, 4, 4).reshape(2, 2);
@@ -508,22 +487,20 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVariableReferenceNoFunction(Nd4jBackend backend) {
         /**
          * Creating a variable should not create a differential function.
          */
         SameDiff sameDiff = SameDiff.create();
         SDVariable sdVariable = sameDiff.var("one", Nd4j.scalar(1.0));
-        assumeNotNull(sameDiff.getVariable(sdVariable.name()));
+        assertNotNull(sameDiff.getVariable(sdVariable.name()));
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVariableWithFunction(Nd4jBackend backend) {
         /**
          * A variable's function should be null
@@ -539,9 +516,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUpdateVariable(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         SDVariable one = sameDiff.one("one", new long[]{1, 1});
@@ -550,9 +526,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDefineFunctionArrayExistence(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         String testFunctionName = "testfunction";
@@ -570,9 +545,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAutoBroadcastAddMatrixVector(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray arr = Nd4j.linspace(1, 4, 4).reshape(2, 2);
@@ -585,18 +559,16 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNegativeOneShape(Nd4jBackend backend) {
         val sd = SameDiff.create();
         SDVariable var = sd.placeHolder("test", DataType.FLOAT, -1, 3);
         assertTrue(var.isPlaceHolder());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testShapeResolutionMinus1(Nd4jBackend backend) {
         int nIn = 3;
         int nOut = 4;
@@ -640,9 +612,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLabelInputPlaceHolderSgd(Nd4jBackend backend) {
 
         SameDiff sd = SameDiff.create();
@@ -680,9 +651,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSequentialMeansPlaceholder(Nd4jBackend backend) {
         OpValidationSuite.ignoreFailing();
         for (int dim0 : new int[]{10, -1}) {
@@ -704,9 +674,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReductionShapes1(Nd4jBackend backend) {
 
         SameDiff sd = SameDiff.create();
@@ -723,9 +692,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReductionShapes2(Nd4jBackend backend) {
 
         SameDiff sd2 = SameDiff.create();
@@ -750,9 +718,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{8}, mB.shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNames(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable in1 = sd.var("in", new long[]{3, 2});
@@ -768,9 +735,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
 //        log.info("Result S: {}", map.get(s.name()));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRunLogisticRegression(Nd4jBackend backend) {
         Map<String, INDArray> vars = this.variablesForInput();
         SameDiff outside = SameDiff.create();
@@ -804,9 +770,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTransposeWithVector(Nd4jBackend backend) {
         val sd = SameDiff.create();
         val matrix = Nd4j.linspace(1, 12, 12).reshape(4, 3);
@@ -818,9 +783,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{3, 1}, out.shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSimpleDefineFunction(Nd4jBackend backend) {
         SameDiff sameDiffOuter = SameDiff.create();
         Map<String, INDArray> inputs = variablesForInput();
@@ -840,9 +804,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         //note here that we don't add the duplicate ops with define function anymore
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSumGradient(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         SDVariable twoByTwo = sameDiff.var("initial", Nd4j.linspace(1, 4, 4, DataType.FLOAT).reshape(2, 2));
@@ -852,9 +815,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRsubScalar(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         Map<String, INDArray> params = new HashMap<>();
@@ -872,9 +834,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFunctionScalarResultPropagation(Nd4jBackend backend) {
         SameDiff sameDiffOuter = SameDiff.create();
         Map<String, INDArray> inputs = variablesForInput();
@@ -903,9 +864,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmul(Nd4jBackend backend) {
         SameDiff sameDiffOuter = SameDiff.create();
         Map<String, INDArray> inputs = variablesForInput();
@@ -915,9 +875,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGraphBuilding(Nd4jBackend backend) {
         final SameDiff sameDiffOuter = SameDiff.create();
         Map<String, INDArray> inputs = variablesForInput();
@@ -947,9 +906,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarAdd(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         SDVariable twoByTwo = sameDiff.var("first", Nd4j.linspace(1, 4, 4).reshape('c', 2, 2));
@@ -960,9 +918,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSums(Nd4jBackend backend) {
         SameDiff sameDiff = SameDiff.create();
         INDArray ones = Nd4j.ones(7, 4);
@@ -974,9 +931,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDenseLayerForwardPass(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -1005,9 +961,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(expOut, m.get(out.name()));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testActivationBackprop(Nd4jBackend backend) {
 
         Activation[] afns = new Activation[]{
@@ -1102,9 +1057,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPlaceholderReduceSimple(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable v = sd.var("in", new long[]{-1, 10});
@@ -1112,9 +1066,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSequentialMeans(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable in = sd.var("in", new long[]{10, 10, 10});
@@ -1122,9 +1075,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         SDVariable mean2 = sd.mean(mean1, 1);   //[10,1] out - ***exception here***
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBatchNormTest(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -1149,9 +1101,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLrn(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -1176,9 +1127,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMoments(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -1202,9 +1152,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(varArray.getDouble(0), 1.25, 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNormalizeMoments(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -1235,9 +1184,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDepthWiseConv2dBasic(Nd4jBackend backend) {
         int nIn = 3;
         int depthWise = 4;
@@ -1275,9 +1223,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{mb, depthWise * nIn, 27, 27}, outShape);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void validateMeanDiff(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -1299,9 +1246,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.valueArrayOf(arr.shape(), 1.0 / arr.length()), dLdIn);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void validateSumDiff(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -1323,9 +1269,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.ones(arr.shape()), dLdIn);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void validateStdevDiff(Nd4jBackend backend) {
         for (boolean biasCorrected : new boolean[]{true, false}) {
             Nd4j.getRandom().setSeed(12345);
@@ -1355,9 +1300,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void validateVarDiff(Nd4jBackend backend) {
         for (boolean biasCorrected : new boolean[]{true, false}) {
             Nd4j.getRandom().setSeed(12345);
@@ -1386,9 +1330,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void validateMinDiff(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -1413,9 +1356,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, dLdIn);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void validateMaxDiff(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -1439,9 +1381,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, dLdIn);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void validateProdDiff(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -1465,9 +1406,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, dLdIn);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSquare(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -1489,9 +1429,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testExpandDims(Nd4jBackend backend) {
         for (int i = 0; i <= 2; i++) {
             SameDiff sd = SameDiff.create();
@@ -1515,9 +1454,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testZerosLike(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable var0 = sd.var("in", DataType.DOUBLE, new long[]{3, 4});
@@ -1531,9 +1469,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.zeros(DataType.DOUBLE, 3, 4), out2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOnesLike(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable var0 = sd.var("in", new long[]{3, 4});
@@ -1548,9 +1485,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOnesLikeBackprop(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable var0 = sd.var("in", new long[]{3, 4});
@@ -1566,9 +1502,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testManhattanAlongDim0(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -1583,9 +1518,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testJaccardDistance(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -1611,9 +1545,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(jd, out.getDouble(0), 1e-6);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPairwiseBooleanTransforms(Nd4jBackend backend) {
         /*
         eq, neq, gt, lt, gte, lte, or, and, xor
@@ -1699,9 +1632,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBooleanChecks(Nd4jBackend backend) {
         /*
         isNonDecreasing,
@@ -1745,9 +1677,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
     @Disabled(/*AS - 20191114 https://github.com/eclipse/deeplearning4j/issues/8393*/)
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIsStrictlyIncShape(Nd4jBackend backend) {
         int nOut = 0;
         int minibatch = 0;
@@ -1758,9 +1689,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         Nd4j.exec(new IsStrictlyIncreasing(ia, expOut));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testExpandDims2d(Nd4jBackend backend) {
         val origShape = new long[]{3, 4};
 
@@ -1797,9 +1727,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSqueezeDims(Nd4jBackend backend) {
         val origShape = new long[]{3, 4, 5};
 
@@ -1840,9 +1769,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testExpandSqueezeChain(Nd4jBackend backend) {
 
         val origShape = new long[]{3, 4};
@@ -1866,9 +1794,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSqueezeExpandChain(Nd4jBackend backend) {
 
         val origShape = new long[]{3, 4, 5};
@@ -1896,9 +1823,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConfusionMatrix(Nd4jBackend backend) {
         INDArray labels = Nd4j.createFromArray(1, 2, 4);
         INDArray pred = Nd4j.createFromArray(2, 2, 4);
@@ -1917,9 +1843,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArgMax(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -1938,9 +1863,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArgMin(Nd4jBackend backend) {
 
         Nd4j.getRandom().setSeed(12345);
@@ -1960,9 +1884,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScatterAdd(Nd4jBackend backend) {
         INDArray arr1 = Nd4j.zeros(3, 3);
         INDArray arr2 = Nd4j.createFromArray(0, 1);
@@ -1984,9 +1907,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScatterMul(Nd4jBackend backend) {
         INDArray arr1 = Nd4j.ones(3, 3);
         INDArray arr2 = Nd4j.createFromArray(0, 1);
@@ -2008,9 +1930,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScatterSub(Nd4jBackend backend) {
         INDArray arr1 = Nd4j.ones(3, 3);
         INDArray arr2 = Nd4j.createFromArray(0, 1);
@@ -2032,9 +1953,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScatterDiv(Nd4jBackend backend) {
         INDArray arr1 = Nd4j.ones(3, 3);
         INDArray arr2 = Nd4j.createFromArray(0, 1);
@@ -2055,9 +1975,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(expected, result.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScatterMax(Nd4jBackend backend) {
         INDArray arr1 = Nd4j.ones(3, 3);
         INDArray arr2 = Nd4j.createFromArray(0, 1);
@@ -2078,9 +1997,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(expected, result.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScatterMin(Nd4jBackend backend) {
         INDArray arr1 = Nd4j.ones(3, 3);
         INDArray arr2 = Nd4j.createFromArray(1, 2);
@@ -2101,9 +2019,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(expected, result.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReciprocal(Nd4jBackend backend) {
         INDArray inArr = Nd4j.linspace(1, 4, 4).reshape(2, 2);
         INDArray expected = Nd4j.onesLike(inArr).divi(inArr);
@@ -2114,9 +2031,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(expected, res);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGather2(Nd4jBackend backend) {
 
         INDArray in = Nd4j.rand(DataType.FLOAT, 10, 10);
@@ -2134,9 +2050,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, act);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGatherOp(Nd4jBackend backend) {
 
         INDArray in = Nd4j.rand(DataType.DOUBLE, 10, 10);
@@ -2165,9 +2080,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConditions(Nd4jBackend backend) {
 
         SameDiff sd = SameDiff.create();
@@ -2204,9 +2118,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         return x;
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGet(Nd4jBackend backend) {
 
         SameDiff sd = SameDiff.create();
@@ -2234,9 +2147,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(expOut5, result5.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetRank3(Nd4jBackend backend) {
 
         SameDiff sd = SameDiff.create();
@@ -2274,9 +2186,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(s6a, y6);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTensorArray1(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         TensorArray tensorArray = sd.tensorArray(DataType.FLOAT);
@@ -2291,9 +2202,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.pile(arr1, arr2), result.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTensorArray2(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         TensorArray tensorArray = sd.tensorArray(DataType.FLOAT);
@@ -2308,9 +2218,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTensorArray3(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         TensorArray tensorArray = sd.tensorArray(DataType.FLOAT);
@@ -2327,9 +2236,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(arr2, result2.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFill(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         INDArray shape = Nd4j.createFromArray(2, 2);
@@ -2349,9 +2257,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPermute(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         INDArray arr = Nd4j.create(new double[]{
@@ -2388,9 +2295,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testExecutionDifferentShapesAccumAlongDim(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable in = sd.var("in", Nd4j.linspace(1, 12, 12).reshape(3, 4));
@@ -2410,9 +2316,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, out2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testExecutionDifferentShapesIndexAccumAlongDim(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable in = sd.var("in", Nd4j.linspace(1, 12, 12).reshape(3, 4));
@@ -2432,9 +2337,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, out2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testExternalErrorsSimple(Nd4jBackend backend) {
         INDArray externalGrad = Nd4j.linspace(1, 12, 12).reshape(3, 4);
 
@@ -2467,9 +2371,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         //Test model serialization:
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUpdatingGradient(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -2499,9 +2402,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertNotEquals(origGrad.get("out"), grads.get(out.name()));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUpdatingGradientSimple(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable in = sd.var("in", Nd4j.linspace(1, 12, 12).reshape(3, 4));
@@ -2529,9 +2431,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertNotEquals(origGrad.get("out"), grads.get(out.name()));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testShapeUpdating(Nd4jBackend backend) {
 
         SameDiff sd = SameDiff.create();
@@ -2571,9 +2472,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{2, 5}, inGrad.shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultiOutput1(Nd4jBackend backend) {
 
         SameDiff sd = SameDiff.create();
@@ -2592,9 +2492,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         sd.createGradFunction();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultiOutput2(Nd4jBackend backend) {
         //Edge case: no functions
         SameDiff sd = SameDiff.create();
@@ -2612,9 +2511,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         sd.createGradFunction();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void sameDiffPlaceholderGrad(Nd4jBackend backend) {
         INDArray x = Nd4j.ones(2, 2);
         INDArray y = Nd4j.ones(2, 2);
@@ -2635,9 +2533,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConvertToConstant(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -2679,9 +2576,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         sd.fit(new SingletonMultiDataSetIterator(new DataSet(inArr, null).toMultiDataSet()), 1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPlaceholderToConstant(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -2723,9 +2619,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         sd.fit(new SingletonMultiDataSetIterator(new MultiDataSet(new INDArray[]{inArr2}, null)), 1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConvertToVariable(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -2765,9 +2660,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         sd.fit(new SingletonMultiDataSetIterator(new DataSet(inArr, null).toMultiDataSet()), 1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDoubleUseOfArray(Nd4jBackend backend) {
         //If array is reused, gradient check will fail
         INDArray a = Nd4j.rand(DataType.DOUBLE, new int[]{3, 4});
@@ -2786,9 +2680,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultiGradientRecurrent(Nd4jBackend backend) {
         final INDArray input = Nd4j.rand(DataType.DOUBLE, new int[]{3, 4, 2});
         final INDArray[] output = new INDArray[(int) input.size(2)];
@@ -2832,9 +2725,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultiGradientManualRecurrent(Nd4jBackend backend) {
         final INDArray input = Nd4j.rand(DataType.DOUBLE, new int[]{3, 4, 2});
         final INDArray[] output = new INDArray[(int) input.size(2)];
@@ -2876,9 +2768,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultiGradient(Nd4jBackend backend) {
         final INDArray input = Nd4j.rand(DataType.DOUBLE, new int[]{3, 4, 2});
         SameDiff sd = SameDiff.create();
@@ -2897,9 +2788,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNonScalarOutput1(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable linspace = sd.linspace("at", DataType.DOUBLE, 1, 15, 15);
@@ -2920,9 +2810,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNonScalarOutput2(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable a = sd.reshape("a", sd.linspace("at", DataType.DOUBLE, 1, 15, 15), 3, 5);
@@ -2942,9 +2831,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNonScalarOutput3(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable a = sd.reshape("a", sd.linspace("at", DataType.DOUBLE, 1, 15, 15), 3, 5);
@@ -2964,9 +2852,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNonScalarOutput4(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable a = sd.var("a", DataType.DOUBLE, 3, 4);
@@ -2988,9 +2875,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNonScalarOutput5(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable linspace = sd.linspace(DataType.DOUBLE, 1, 75, 75);
@@ -3011,9 +2897,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSameDiffBackprop1(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         final SDVariable a = sd.var("a", Nd4j.rand(4, 4));
@@ -3027,9 +2912,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         Map<String,INDArray> g = sd.calculateGradients(null, sd.getVariables().keySet());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSameDiffNoGradForConstantAndPlaceholder(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         final SDVariable a = sd.var("a", Nd4j.rand(4, 4));
@@ -3044,9 +2928,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertNull(sd.grad("c"));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDuplicateNamePlaceholder(Nd4jBackend backend) {
 
         for (int i = 0; i < 2; i++) {
@@ -3100,9 +2983,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSameDiffGetArrayScalar(Nd4jBackend backend) {
         final INDArray array = Nd4j.rand(1, 1);
         final SameDiff sd = SameDiff.create();
@@ -3110,9 +2992,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         a.getArr();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVariableRenaming(Nd4jBackend backend) {
 
         SameDiff sd = SameDiff.create();
@@ -3134,9 +3015,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(out, out2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVariableRenaming2(Nd4jBackend backend) {
 
         SameDiff sd = SameDiff.create();
@@ -3158,9 +3038,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         sd.fit(new DataSet(Nd4j.rand(DataType.FLOAT, 3, 4), null));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPlaceholderShapeValidation(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable scalar = sd.scalar("scalar", 0.0f);
@@ -3225,9 +3104,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInferenceWithoutLabel(Nd4jBackend backend) {
         //We don't need a value for the label placeholder to calculate most values here
 
@@ -3264,9 +3142,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(out, out2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInferenceWithoutUnnecessaryPlaceholders(Nd4jBackend backend) {
         //We don't need an array for 2 of the placeholders to calculate the
 
@@ -3308,9 +3185,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConvertDTypes1(Nd4jBackend backend) {
 
         SameDiff sd = SameDiff.create();
@@ -3354,9 +3230,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(DataType.DOUBLE, y.getArr().dataType());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConvertDTypes2(Nd4jBackend backend) {
 
         SameDiff sd = SameDiff.create();
@@ -3408,9 +3283,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGradFnRequiredVars(Nd4jBackend backend) {
         //User can explicitly request that gradients for specific vars are available when differentiating (creating grad function),
         // even if they normally wouldn't be needed or calculated
@@ -3450,9 +3324,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIf() throws IOException {
         SameDiff sd = SameDiff.create();
         SDVariable a = sd.placeHolder("a", DataType.DOUBLE);
@@ -3479,9 +3352,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.createFromArray(14.0), sd.output(secondBranch, "out").get("out"));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNestedIf() throws IOException {
         SameDiff sd = SameDiff.create();
         SDVariable a = sd.var("a", Nd4j.createFromArray(2.0));
@@ -3504,9 +3376,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.createFromArray(10.0), sd.output(Collections.emptyMap(), "out").get("out"));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWhile() throws IOException {
 
         SameDiff sd = SameDiff.create();
@@ -3554,9 +3425,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNestedWhileIf() throws IOException {
         SameDiff sd = SameDiff.create();
         SDVariable countIn = sd.constant(5);
@@ -3581,9 +3451,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(115, sd.output(Collections.emptyMap(), outName).get(outName).getInt(0));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMod_1(Nd4jBackend backend) {
         val sd = SameDiff.create();
         val initial = sd.constant("initial", Nd4j.createFromArray(5.f, 6.f, 7.f));
@@ -3595,9 +3464,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(e, mod.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void castShapeTest1(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable x = sd.constant(Nd4j.createFromArray(1, 2, 3, 4));
@@ -3618,9 +3486,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyShapeVar(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -3641,9 +3508,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPReLU(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -3667,9 +3533,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertNull(err);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSameDiffSeedReproducibilityVarInit(Nd4jBackend backend) {
 
         SameDiff sd0 = SameDiff.create();
@@ -3694,9 +3559,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCalculateGradientsAndOutputs(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable in = sd.placeHolder("in", DataType.FLOAT, -1, 4);
@@ -3721,9 +3585,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(gExp, g);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcatVariableGrad(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable label = sd.var("label", DataType.FLOAT, 3, 4);
@@ -3743,9 +3606,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSliceVariableGrad(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable label = sd.var("label", DataType.FLOAT, 3, 4);
@@ -3763,9 +3625,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertEquals(map.get("input"), map.get("concat"));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTrainingConfigJson(Nd4jBackend backend) {
         for(IEvaluation e : new IEvaluation[]{new Evaluation(), new RegressionEvaluation(), new EvaluationBinary(), new ROC(),
                 new ROCMultiClass(), new ROCBinary(), new EvaluationCalibration()}) {
@@ -3781,9 +3642,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRngSanityCheck(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
         for(DataType dt : new DataType[]{DataType.FLOAT, DataType.DOUBLE,DataType.BFLOAT16}) {
@@ -3798,9 +3658,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMissingPlaceholderError(Nd4jBackend backend) {
 
         SameDiff sd = SameDiff.create();
@@ -3824,9 +3683,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEquals1(Nd4jBackend backend) {
 
         SameDiff sd1 = SameDiff.create();
@@ -3873,9 +3731,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertNotEquals(sd1, sd2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConv2DWeightsFormat(Nd4jBackend backend) {
         int bS=2, iH=4,iW=3,  iC=4,oC=3,  kH=3,kW=2,  sH=1,sW=1,  pH=0,pW=0,  dH=1,dW=1;
         int       oH=2,oW=2;
@@ -3910,9 +3767,8 @@ public class SameDiffTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{bS, oC, oH, oW}, out.eval().shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConv2DDifferentWeightsFormat(Nd4jBackend backend) {
         int bS=2, iH=4,iW=3,  iC=4,oC=3,  kH=3,kW=2,  sH=1,sW=1,  pH=0,pW=0,  dH=1,dW=1;
         int       oH=2,oW=2;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffTrainingTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffTrainingTest.java
index ef0918eb7..1f2f978e3 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffTrainingTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffTrainingTest.java
@@ -60,9 +60,8 @@ import org.nd4j.weightinit.impl.XavierInitScheme;
 public class SameDiffTrainingTest extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void irisTrainingSanityCheck(Nd4jBackend backend) {
 
         DataSetIterator iter = new IrisDataSetIterator(150, 150);
@@ -134,9 +133,8 @@ public class SameDiffTrainingTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void irisTrainingEvalTest(Nd4jBackend backend) {
 
         DataSetIterator iter = new IrisDataSetIterator(150, 150);
@@ -186,9 +184,8 @@ public class SameDiffTrainingTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void irisTrainingValidationTest(Nd4jBackend backend) {
 
         DataSetIterator iter = new IrisDataSetIterator(150, 150);
@@ -243,9 +240,8 @@ public class SameDiffTrainingTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTrainingMixedDtypes(){
 
         for (String u : new String[]{"adam", "nesterov", "adamax", "amsgrad"}) {
@@ -307,9 +303,8 @@ public class SameDiffTrainingTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void simpleClassification(Nd4jBackend backend) {
         double learning_rate = 0.001;
         int seed = 7;
@@ -356,9 +351,8 @@ public class SameDiffTrainingTest extends BaseNd4jTestWithBackends {
         History history = sd.fit(new SingletonMultiDataSetIterator(mds), 1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTrainingEvalVarNotReqForLoss(){
         //If a variable is not required for the loss - normally it won't be calculated
         //But we want to make sure it IS calculated here - so we can perform evaluation on it
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/listeners/CheckpointListenerTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/listeners/CheckpointListenerTest.java
index 59173bd6b..1ede55456 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/listeners/CheckpointListenerTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/listeners/CheckpointListenerTest.java
@@ -20,7 +20,7 @@
 
 package org.nd4j.autodiff.samediff.listeners;
 
-import org.junit.Assert;
+
 
 import org.junit.jupiter.api.Test;
 
@@ -47,8 +47,9 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import static junit.framework.TestCase.assertTrue;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class CheckpointListenerTest extends BaseNd4jTestWithBackends {
 
@@ -94,9 +95,8 @@ public class CheckpointListenerTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCheckpointEveryEpoch(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         File dir = testDir.toFile();
 
@@ -130,9 +130,8 @@ public class CheckpointListenerTest extends BaseNd4jTestWithBackends {
         assertTrue(found1 && found2 && found3);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCheckpointEvery5Iter(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         File dir = testDir.toFile();
 
@@ -165,15 +164,14 @@ public class CheckpointListenerTest extends BaseNd4jTestWithBackends {
         }
         assertEquals(5, files.length);  //4 checkpoints and 1 text file (metadata)
 
-        for( int i=0; i<found.length; i++ ){
-            assertTrue(names.get(i), found[i]);
+        for( int i = 0; i < found.length; i++) {
+            assertTrue(found[i], names.get(i));
         }
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCheckpointListenerEveryTimeUnit(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         File dir = testDir.toFile();
         SameDiff sd = getModel();
@@ -213,13 +211,12 @@ public class CheckpointListenerTest extends BaseNd4jTestWithBackends {
         }
 
         for( int i = 0; i < found.length; i++) {
-            assertTrue(names.get(i), found[i]);
+            assertTrue(found[i], names.get(i));
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCheckpointListenerKeepLast3AndEvery3(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         File dir = testDir.toFile();
         SameDiff sd = getModel();
@@ -258,8 +255,8 @@ public class CheckpointListenerTest extends BaseNd4jTestWithBackends {
         }
 
         assertEquals(5, cpNums.size(),cpNums.toString());
-        Assert.assertTrue(cpNums.toString(), cpNums.containsAll(Arrays.asList(2, 5, 7, 8, 9)));
-        Assert.assertTrue(epochNums.toString(), epochNums.containsAll(Arrays.asList(5, 11, 15, 17, 19)));
+        assertTrue(cpNums.containsAll(Arrays.asList(2, 5, 7, 8, 9)), cpNums.toString());
+        assertTrue(epochNums.containsAll(Arrays.asList(5, 11, 15, 17, 19)), epochNums.toString());
 
         assertEquals(5, l.availableCheckpoints().size());
     }
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/listeners/ExecDebuggingListenerTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/listeners/ExecDebuggingListenerTest.java
index b6da08666..0d524a7e3 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/listeners/ExecDebuggingListenerTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/listeners/ExecDebuggingListenerTest.java
@@ -38,9 +38,8 @@ import org.nd4j.linalg.learning.config.Adam;
 public class ExecDebuggingListenerTest extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testExecDebugListener(Nd4jBackend backend) {
 
         SameDiff sd = SameDiff.create();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/listeners/ListenerTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/listeners/ListenerTest.java
index fd752d091..e3a969fb4 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/listeners/ListenerTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/listeners/ListenerTest.java
@@ -71,9 +71,8 @@ public class ListenerTest extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void irisHistoryTest(Nd4jBackend backend) {
 
         DataSetIterator iter = new IrisDataSetIterator(150, 150);
@@ -136,9 +135,8 @@ public class ListenerTest extends BaseNd4jTestWithBackends {
         assertTrue(acc >= 0.75,"Accuracy < 75%, was " + acc);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testListenerCalls(){
         SameDiff sd = SameDiff.create();
         SDVariable in = sd.placeHolder("in", DataType.FLOAT, -1, 4);
@@ -275,9 +273,8 @@ public class ListenerTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCustomListener(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
         SDVariable in = sd.placeHolder("input", DataType.FLOAT, -1, 4);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/listeners/ProfilingListenerTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/listeners/ProfilingListenerTest.java
index fc78748f8..afe21027b 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/listeners/ProfilingListenerTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/listeners/ProfilingListenerTest.java
@@ -57,9 +57,8 @@ public class ProfilingListenerTest extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testProfilingListenerSimple(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
 
         SameDiff sd = SameDiff.create();
@@ -108,25 +107,22 @@ public class ProfilingListenerTest extends BaseNd4jTestWithBackends {
     }
 
     /*
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLoadTfProfile(){
         File f = new File("C:\\Temp\\sd_profiler\\tf_profile.json");
         ProfileAnalyzer.summarizeProfile(f, ProfileAnalyzer.ProfileFormat.TENSORFLOW);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLoadTfProfileDir(){
         File f = new File("C:\\Temp\\sd_profiler\\tf_multiple_profiles");
         ProfileAnalyzer.summarizeProfileDirectory(f, ProfileAnalyzer.ProfileFormat.TENSORFLOW);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLoadTfProfileDir2(){
         File f = new File("C:\\DL4J\\Git\\dl4j-dev-tools\\import-tests\\profiling\\mobilenet_v2_1.0_224_batch32_tf-1.15.0");
         ProfileAnalyzer.summarizeProfileDirectory(f, ProfileAnalyzer.ProfileFormat.TENSORFLOW);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/ui/FileReadWriteTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/ui/FileReadWriteTests.java
index f9469a7be..e13aa1097 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/ui/FileReadWriteTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/ui/FileReadWriteTests.java
@@ -79,9 +79,8 @@ public class FileReadWriteTests extends BaseNd4jTestWithBackends {
         Nd4j.getRandom().setSeed(123);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSimple(@TempDir Path testDir,Nd4jBackend backend) throws IOException {
         SameDiff sd = SameDiff.create();
         SDVariable v = sd.var("variable", DataType.DOUBLE, 3, 4);
@@ -185,9 +184,8 @@ public class FileReadWriteTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNullBinLabels(@TempDir Path testDir,Nd4jBackend backend) throws Exception{
         File dir = testDir.toFile();
         File f = new File(dir, "temp.bin");
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/ui/UIListenerTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/ui/UIListenerTest.java
index 02eaf63c1..70b43b467 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/ui/UIListenerTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/ui/UIListenerTest.java
@@ -63,9 +63,8 @@ public class UIListenerTest extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUIListenerBasic(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         Nd4j.getRandom().setSeed(12345);
 
@@ -101,9 +100,8 @@ public class UIListenerTest extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{150, 3}, out.shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUIListenerContinue(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         IrisDataSetIterator iter = new IrisDataSetIterator(150, 150);
 
@@ -194,9 +192,8 @@ public class UIListenerTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUIListenerBadContinue(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         IrisDataSetIterator iter = new IrisDataSetIterator(150, 150);
         SameDiff sd1 = getSimpleNet();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/CustomEvaluationTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/CustomEvaluationTest.java
index 386cc66ee..b0824bcd8 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/CustomEvaluationTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/CustomEvaluationTest.java
@@ -40,9 +40,8 @@ public class CustomEvaluationTest extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void customEvalTest(Nd4jBackend backend){
         CustomEvaluation accuracyEval = new CustomEvaluation<>(
                 (labels, pred, mask, meta) -> new Pair<>(labels.eq(pred).castTo(DataType.INT).sumNumber(), labels.size(0)),
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EmptyEvaluationTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EmptyEvaluationTests.java
index 621cdfa97..5e5add4e8 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EmptyEvaluationTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EmptyEvaluationTests.java
@@ -45,9 +45,8 @@ public class EmptyEvaluationTests extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyEvaluation (Nd4jBackend backend) {
         Evaluation e = new Evaluation();
         System.out.println(e.stats());
@@ -62,9 +61,8 @@ public class EmptyEvaluationTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyRegressionEvaluation (Nd4jBackend backend) {
         RegressionEvaluation re = new RegressionEvaluation();
         re.stats();
@@ -78,9 +76,8 @@ public class EmptyEvaluationTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyEvaluationBinary(Nd4jBackend backend) {
         EvaluationBinary eb = new EvaluationBinary();
         eb.stats();
@@ -95,9 +92,8 @@ public class EmptyEvaluationTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyROC(Nd4jBackend backend) {
         ROC roc = new ROC();
         roc.stats();
@@ -112,9 +108,8 @@ public class EmptyEvaluationTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyROCBinary(Nd4jBackend backend) {
         ROCBinary rb = new ROCBinary();
         rb.stats();
@@ -129,9 +124,8 @@ public class EmptyEvaluationTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyROCMultiClass(Nd4jBackend backend) {
         ROCMultiClass r = new ROCMultiClass();
         r.stats();
@@ -146,9 +140,8 @@ public class EmptyEvaluationTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyEvaluationCalibration(Nd4jBackend backend) {
         EvaluationCalibration ec = new EvaluationCalibration();
         ec.stats();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EvalCustomThreshold.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EvalCustomThreshold.java
index 3b94ee60a..c7b4d31a3 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EvalCustomThreshold.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EvalCustomThreshold.java
@@ -46,9 +46,8 @@ public class EvalCustomThreshold extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvaluationCustomBinaryThreshold(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -114,9 +113,8 @@ public class EvalCustomThreshold extends BaseNd4jTestWithBackends {
         assertEquals(ex2.getConfusionMatrix(), e025v2.getConfusionMatrix());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvaluationCostArray(Nd4jBackend backend) {
 
 
@@ -164,9 +162,8 @@ public class EvalCustomThreshold extends BaseNd4jTestWithBackends {
         assertEquals(1.0, e2.accuracy(), 1e-6);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvaluationBinaryCustomThreshold(Nd4jBackend backend) {
 
         //Sanity check: same results for 0.5 threshold vs. default (no threshold)
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EvalJsonTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EvalJsonTest.java
index ecc0b10f4..77668fe38 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EvalJsonTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EvalJsonTest.java
@@ -39,9 +39,7 @@ import org.nd4j.linalg.api.ops.random.impl.BernoulliDistribution;
 import org.nd4j.linalg.factory.Nd4j;
 import org.nd4j.linalg.factory.Nd4jBackend;
 
-import static junit.framework.TestCase.assertNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 
 public class EvalJsonTest extends BaseNd4jTestWithBackends {
@@ -52,9 +50,8 @@ public class EvalJsonTest extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSerdeEmpty(Nd4jBackend backend) {
         boolean print = false;
 
@@ -74,9 +71,8 @@ public class EvalJsonTest extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSerde(Nd4jBackend backend) {
         boolean print = false;
         Nd4j.getRandom().setSeed(12345);
@@ -124,9 +120,8 @@ public class EvalJsonTest extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSerdeExactRoc(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
         boolean print = false;
@@ -204,9 +199,8 @@ public class EvalJsonTest extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testJsonYamlCurves(Nd4jBackend backend) {
         ROC roc = new ROC(0);
 
@@ -258,9 +252,8 @@ public class EvalJsonTest extends BaseNd4jTestWithBackends {
 
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testJsonWithCustomThreshold(Nd4jBackend backend) {
 
         //Evaluation - binary threshold
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EvalTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EvalTest.java
index d2ec5aff5..1acab9d4a 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EvalTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EvalTest.java
@@ -50,9 +50,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEval(Nd4jBackend backend) {
         int classNum = 5;
         Evaluation eval = new Evaluation (classNum);
@@ -91,9 +90,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
         assertEquals(0.5, eval.accuracy(), 0);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEval2(Nd4jBackend backend) {
 
         DataType dtypeBefore = Nd4j.defaultFloatingPointType();
@@ -152,9 +150,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStringListLabels(Nd4jBackend backend) {
         INDArray trueOutcome = FeatureUtil.toOutcomeVector(0, 2);
         INDArray predictedOutcome = FeatureUtil.toOutcomeVector(0, 2);
@@ -171,9 +168,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStringHashLabels(Nd4jBackend backend) {
         INDArray trueOutcome = FeatureUtil.toOutcomeVector(0, 2);
         INDArray predictedOutcome = FeatureUtil.toOutcomeVector(0, 2);
@@ -190,9 +186,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvalMasking(Nd4jBackend backend) {
         int miniBatch = 5;
         int nOut = 3;
@@ -259,9 +254,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFalsePerfectRecall(Nd4jBackend backend) {
         int testSize = 100;
         int numClasses = 5;
@@ -294,9 +288,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
         assertNotEquals(1.0, eval.recall());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvaluationMerging(Nd4jBackend backend) {
 
         int nRows = 20;
@@ -370,9 +363,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSingleClassBinaryClassification(Nd4jBackend backend) {
 
         Evaluation eval = new Evaluation(1);
@@ -401,9 +393,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvalInvalid(Nd4jBackend backend) {
         Evaluation e = new Evaluation(5);
         e.eval(0, 1);
@@ -416,9 +407,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
         assertFalse(e.stats().contains("\uFFFD"));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvalMethods(Nd4jBackend backend) {
         //Check eval(int,int) vs. eval(INDArray,INDArray)
 
@@ -461,9 +451,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTopNAccuracy(Nd4jBackend backend) {
 
         Evaluation e = new Evaluation(null, 3);
@@ -524,9 +513,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTopNAccuracyMerging(Nd4jBackend backend) {
 
         Evaluation e1 = new Evaluation(null, 3);
@@ -574,9 +562,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
         assertEquals(6.0 / 8, e1.topNAccuracy(), 1e-6);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBinaryCase(Nd4jBackend backend) {
         INDArray ones10 = Nd4j.ones(10, 1);
         INDArray ones4 = Nd4j.ones(4, 1);
@@ -605,9 +592,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
         assertEquals(2, (int) e.truePositives().get(0));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testF1FBeta_MicroMacroAveraging(Nd4jBackend backend) {
         //Confusion matrix: rows = actual, columns = predicted
         //[3, 1, 0]
@@ -748,9 +734,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConfusionMatrixStats(Nd4jBackend backend) {
 
         Evaluation e = new Evaluation();
@@ -771,9 +756,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvalBinaryMetrics(){
 
         Evaluation ePosClass1_nOut2 = new Evaluation(2, 1);
@@ -894,9 +878,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConfusionMatrixString(){
 
         Evaluation e = new Evaluation(Arrays.asList("a","b","c"));
@@ -946,9 +929,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
         e.stats(false, true);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvaluationNaNs(){
 
         Evaluation e = new Evaluation();
@@ -963,9 +945,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSegmentation(){
         for( int c : new int[]{4, 1}) { //c=1 should be treated as binary classification case
             Nd4j.getRandom().setSeed(12345);
@@ -1059,9 +1040,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLabelReset(){
 
         Map<Integer,String> m = new HashMap<>();
@@ -1094,9 +1074,8 @@ public class EvalTest extends BaseNd4jTestWithBackends {
         assertEquals(s1, s2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvalStatsBinaryCase(){
         //Make sure we report class 1 precision/recall/f1 not macro averaged, for binary case
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EvaluationBinaryTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EvaluationBinaryTest.java
index d82a4fa64..9bcdcb1c3 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EvaluationBinaryTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EvaluationBinaryTest.java
@@ -48,9 +48,8 @@ public class EvaluationBinaryTest extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvaluationBinary(Nd4jBackend backend) {
         //Compare EvaluationBinary to Evaluation class
         DataType dtypeBefore = Nd4j.defaultFloatingPointType();
@@ -136,9 +135,8 @@ public class EvaluationBinaryTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvaluationBinaryMerging(Nd4jBackend backend) {
         int nOut = 4;
         int[] shape1 = {30, nOut};
@@ -165,9 +163,8 @@ public class EvaluationBinaryTest extends BaseNd4jTestWithBackends {
         assertEquals(eb.stats(), eb1.stats());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvaluationBinaryPerOutputMasking(Nd4jBackend backend) {
 
         //Provide a mask array: "ignore" the masked steps
@@ -210,9 +207,8 @@ public class EvaluationBinaryTest extends BaseNd4jTestWithBackends {
         assertEquals(1, eb.falseNegatives(2));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTimeSeriesEval(Nd4jBackend backend) {
 
         int[] shape = {2, 4, 3};
@@ -236,9 +232,8 @@ public class EvaluationBinaryTest extends BaseNd4jTestWithBackends {
         assertEquals(eb2.stats(), eb1.stats());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvaluationBinaryWithROC(Nd4jBackend backend) {
         //Simple test for nested ROCBinary in EvaluationBinary
 
@@ -255,9 +250,8 @@ public class EvaluationBinaryTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvaluationBinary3d(Nd4jBackend backend) {
         INDArray prediction = Nd4j.rand(DataType.FLOAT, 2, 5, 10);
         INDArray label = Nd4j.rand(DataType.FLOAT, 2, 5, 10);
@@ -291,9 +285,8 @@ public class EvaluationBinaryTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvaluationBinary4d(Nd4jBackend backend) {
         INDArray prediction = Nd4j.rand(DataType.FLOAT, 2, 3, 10, 10);
         INDArray label = Nd4j.rand(DataType.FLOAT, 2, 3, 10, 10);
@@ -327,9 +320,8 @@ public class EvaluationBinaryTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvaluationBinary3dMasking(Nd4jBackend backend) {
         INDArray prediction = Nd4j.rand(DataType.FLOAT, 2, 3, 10);
         INDArray label = Nd4j.rand(DataType.FLOAT, 2, 3, 10);
@@ -390,9 +382,8 @@ public class EvaluationBinaryTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvaluationBinary4dMasking(Nd4jBackend backend) {
         INDArray prediction = Nd4j.rand(DataType.FLOAT, 2, 3, 10, 10);
         INDArray label = Nd4j.rand(DataType.FLOAT, 2, 3, 10, 10);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EvaluationCalibrationTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EvaluationCalibrationTest.java
index 2d11b8c22..ad30c6787 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EvaluationCalibrationTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/EvaluationCalibrationTest.java
@@ -49,9 +49,8 @@ public class EvaluationCalibrationTest extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReliabilityDiagram (Nd4jBackend backend) {
 
         DataType dtypeBefore = Nd4j.defaultFloatingPointType();
@@ -143,9 +142,8 @@ public class EvaluationCalibrationTest extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLabelAndPredictionCounts (Nd4jBackend backend) {
 
         int minibatch = 50;
@@ -173,9 +171,8 @@ public class EvaluationCalibrationTest extends BaseNd4jTestWithBackends {
         assertArrayEquals(expPredictionCount, ec.getPredictionCountsEachClass());
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testResidualPlots (Nd4jBackend backend) {
 
         int minibatch = 50;
@@ -276,9 +273,8 @@ public class EvaluationCalibrationTest extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSegmentation(){
         for( int c : new int[]{4, 1}) { //c=1 should be treated as binary classification case
             Nd4j.getRandom().setSeed(12345);
@@ -372,9 +368,8 @@ public class EvaluationCalibrationTest extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvaluationCalibration3d (Nd4jBackend backend) {
         INDArray prediction = Nd4j.rand(DataType.FLOAT, 2, 5, 10);
         INDArray label = Nd4j.rand(DataType.FLOAT, 2, 5, 10);
@@ -406,9 +401,8 @@ public class EvaluationCalibrationTest extends BaseNd4jTestWithBackends {
         assertEquals(e2d.stats(), e3d.stats());
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvaluationCalibration3dMasking (Nd4jBackend backend) {
         INDArray prediction = Nd4j.rand(DataType.FLOAT, 2, 3, 10);
         INDArray label = Nd4j.rand(DataType.FLOAT, 2, 3, 10);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/NewInstanceTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/NewInstanceTest.java
index 2e4fee8c9..548f17cf6 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/NewInstanceTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/NewInstanceTest.java
@@ -46,9 +46,8 @@ public class NewInstanceTest extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNewInstances(Nd4jBackend backend) {
         boolean print = true;
         Nd4j.getRandom().setSeed(12345);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/ROCBinaryTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/ROCBinaryTest.java
index a653070a4..d22c2270a 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/ROCBinaryTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/ROCBinaryTest.java
@@ -48,9 +48,8 @@ public class ROCBinaryTest extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testROCBinary(Nd4jBackend backend) {
         //Compare ROCBinary to ROC class
 
@@ -145,9 +144,8 @@ public class ROCBinaryTest extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRocBinaryMerging(Nd4jBackend backend) {
         for (int nSteps : new int[]{30, 0}) { //0 == exact
             int nOut = 4;
@@ -177,9 +175,8 @@ public class ROCBinaryTest extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testROCBinaryPerOutputMasking(Nd4jBackend backend) {
 
         for (int nSteps : new int[]{30, 0}) { //0 == exact
@@ -219,9 +216,8 @@ public class ROCBinaryTest extends BaseNd4jTestWithBackends {
 
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testROCBinary3d(Nd4jBackend backend) {
         INDArray prediction = Nd4j.rand(DataType.FLOAT, 2, 5, 10);
         INDArray label = Nd4j.rand(DataType.FLOAT, 2, 5, 10);
@@ -255,9 +251,8 @@ public class ROCBinaryTest extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testROCBinary4d(Nd4jBackend backend) {
         INDArray prediction = Nd4j.rand(DataType.FLOAT, 2, 3, 10, 10);
         INDArray label = Nd4j.rand(DataType.FLOAT, 2, 3, 10, 10);
@@ -291,9 +286,8 @@ public class ROCBinaryTest extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testROCBinary3dMasking(Nd4jBackend backend) {
         INDArray prediction = Nd4j.rand(DataType.FLOAT, 2, 3, 10);
         INDArray label = Nd4j.rand(DataType.FLOAT, 2, 3, 10);
@@ -354,9 +348,8 @@ public class ROCBinaryTest extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testROCBinary4dMasking(Nd4jBackend backend) {
         INDArray prediction = Nd4j.rand(DataType.FLOAT, 2, 3, 10, 10);
         INDArray label = Nd4j.rand(DataType.FLOAT, 2, 3, 10, 10);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/ROCTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/ROCTest.java
index d8a1fecf8..26986bd87 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/ROCTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/ROCTest.java
@@ -82,9 +82,8 @@ public class ROCTest extends BaseNd4jTestWithBackends {
         expFPR.put(10 / 10.0, 0.0 / totalNegatives);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRocBasic(Nd4jBackend backend) {
         //2 outputs here - probability distribution over classes (softmax)
         INDArray predictions = Nd4j.create(new double[][] {{1.0, 0.001}, //add 0.001 to avoid numerical/rounding issues (float vs. double, etc)
@@ -127,9 +126,8 @@ public class ROCTest extends BaseNd4jTestWithBackends {
         assertEquals(1.0, auc, 1e-6);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRocBasicSingleClass(Nd4jBackend backend) {
         //1 output here - single probability value (sigmoid)
 
@@ -167,9 +165,8 @@ public class ROCTest extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRoc(Nd4jBackend backend) {
         //Previous tests allowed for a perfect classifier with right threshold...
 
@@ -254,9 +251,8 @@ public class ROCTest extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRocTimeSeriesNoMasking(Nd4jBackend backend) {
         //Same as first test...
 
@@ -303,9 +299,8 @@ public class ROCTest extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRocTimeSeriesMasking(Nd4jBackend backend) {
         //2 outputs here - probability distribution over classes (softmax)
         INDArray predictions2d = Nd4j.create(new double[][] {{1.0, 0.001}, //add 0.001 to avoid numerical/rounding issues (float vs. double, etc)
@@ -355,9 +350,8 @@ public class ROCTest extends BaseNd4jTestWithBackends {
 
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCompareRocAndRocMultiClass(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -387,9 +381,8 @@ public class ROCTest extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCompare2Vs3Classes(Nd4jBackend backend) {
 
         //ROC multi-class: 2 vs. 3 classes should be the same, if we add two of the classes together...
@@ -438,9 +431,8 @@ public class ROCTest extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testROCMerging(Nd4jBackend backend) {
         int nArrays = 10;
         int minibatch = 64;
@@ -485,9 +477,8 @@ public class ROCTest extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testROCMerging2(Nd4jBackend backend) {
         int nArrays = 10;
         int minibatch = 64;
@@ -532,9 +523,8 @@ public class ROCTest extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testROCMultiMerging(Nd4jBackend backend) {
 
         int nArrays = 10;
@@ -582,9 +572,8 @@ public class ROCTest extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAUCPrecisionRecall(Nd4jBackend backend) {
         //Assume 2 positive examples, at 0.33 and 0.66 predicted, 1 negative example at 0.25 prob
         //at threshold 0 to 0.24999: tp=2, fp=1, fn=0, tn=0 prec=2/(2+1)=0.666, recall=2/2=1.0
@@ -631,9 +620,8 @@ public class ROCTest extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRocAucExact(Nd4jBackend backend) {
 
         //Check the implementation vs. Scikitlearn
@@ -796,9 +784,8 @@ public class ROCTest extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void rocExactEdgeCaseReallocation(Nd4jBackend backend) {
 
         //Set reallocation block size to say 20, but then evaluate a 100-length array
@@ -810,9 +797,8 @@ public class ROCTest extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPrecisionRecallCurveGetPointMethods(Nd4jBackend backend) {
         double[] threshold = new double[101];
         double[] precision = threshold;
@@ -848,9 +834,8 @@ public class ROCTest extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPrecisionRecallCurveConfusion(Nd4jBackend backend) {
         //Sanity check: values calculated from the confusion matrix should match the PR curve values
 
@@ -889,9 +874,8 @@ public class ROCTest extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRocMerge(){
         Nd4j.getRandom().setSeed(12345);
 
@@ -935,9 +919,8 @@ public class ROCTest extends BaseNd4jTestWithBackends {
         assertEquals(auprc, auprcAct, 1e-6);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRocMultiMerge(){
         Nd4j.getRandom().setSeed(12345);
 
@@ -986,9 +969,8 @@ public class ROCTest extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRocBinaryMerge(){
         Nd4j.getRandom().setSeed(12345);
 
@@ -1033,9 +1015,8 @@ public class ROCTest extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSegmentationBinary(){
         for( int c : new int[]{4, 1}) { //c=1 should be treated as binary classification case
             Nd4j.getRandom().setSeed(12345);
@@ -1125,9 +1106,8 @@ public class ROCTest extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSegmentation(){
         for( int c : new int[]{4, 1}) { //c=1 should be treated as binary classification case
             Nd4j.getRandom().setSeed(12345);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/RegressionEvalTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/RegressionEvalTest.java
index ad373785a..aaa4c07c6 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/RegressionEvalTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/RegressionEvalTest.java
@@ -63,9 +63,8 @@ public class RegressionEvalTest  extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPerfectPredictions(Nd4jBackend backend) {
 
         int nCols = 5;
@@ -92,9 +91,8 @@ public class RegressionEvalTest  extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testKnownValues(Nd4jBackend backend) {
 
         DataType dtypeBefore = Nd4j.defaultFloatingPointType();
@@ -150,9 +148,8 @@ public class RegressionEvalTest  extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRegressionEvaluationMerging(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -193,9 +190,8 @@ public class RegressionEvalTest  extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRegressionEvalPerOutputMasking(Nd4jBackend backend) {
 
         INDArray l = Nd4j.create(new double[][] {{1, 2, 3}, {10, 20, 30}, {-5, -10, -20}});
@@ -222,9 +218,8 @@ public class RegressionEvalTest  extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRegressionEvalTimeSeriesSplit(){
 
         INDArray out1 = Nd4j.rand(new int[]{3, 5, 20});
@@ -246,9 +241,8 @@ public class RegressionEvalTest  extends BaseNd4jTestWithBackends {
         assertEquals(e1, e2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRegressionEval3d(Nd4jBackend backend) {
         INDArray prediction = Nd4j.rand(DataType.FLOAT, 2, 5, 10);
         INDArray label = Nd4j.rand(DataType.FLOAT, 2, 5, 10);
@@ -280,9 +274,8 @@ public class RegressionEvalTest  extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRegressionEval4d(Nd4jBackend backend) {
         INDArray prediction = Nd4j.rand(DataType.FLOAT, 2, 3, 10, 10);
         INDArray label = Nd4j.rand(DataType.FLOAT, 2, 3, 10, 10);
@@ -314,9 +307,8 @@ public class RegressionEvalTest  extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRegressionEval3dMasking(Nd4jBackend backend) {
         INDArray prediction = Nd4j.rand(DataType.FLOAT, 2, 3, 10);
         INDArray label = Nd4j.rand(DataType.FLOAT, 2, 3, 10);
@@ -375,9 +367,8 @@ public class RegressionEvalTest  extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRegressionEval4dMasking(Nd4jBackend backend) {
         INDArray prediction = Nd4j.rand(DataType.FLOAT, 2, 3, 10, 10);
         INDArray label = Nd4j.rand(DataType.FLOAT, 2, 3, 10, 10);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/TestLegacyJsonLoading.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/TestLegacyJsonLoading.java
index e25e6554f..85a497410 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/TestLegacyJsonLoading.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/evaluation/TestLegacyJsonLoading.java
@@ -44,9 +44,8 @@ public class TestLegacyJsonLoading extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEvalLegacyFormat(Nd4jBackend backend) throws Exception {
 
         File f = new ClassPathResource("regression_testing/eval_100b/evaluation.json").getFile();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/AveragingTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/AveragingTests.java
index d38f9107c..ae016aec2 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/AveragingTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/AveragingTests.java
@@ -60,9 +60,8 @@ public class AveragingTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSingleDeviceAveraging1(Nd4jBackend backend) {
         INDArray array1 = Nd4j.valueArrayOf(LENGTH, 1.0);
         INDArray array2 = Nd4j.valueArrayOf(LENGTH, 2.0);
@@ -109,9 +108,8 @@ public class AveragingTests extends BaseNd4jTestWithBackends {
         assertEquals(arrayMean, array16);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSingleDeviceAveraging2(Nd4jBackend backend) {
         INDArray exp = Nd4j.linspace(1, LENGTH, LENGTH);
         List<INDArray> arrays = new ArrayList<>();
@@ -128,9 +126,8 @@ public class AveragingTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAccumulation1(Nd4jBackend backend) {
         INDArray array1 = Nd4j.create(100).assign(1.0);
         INDArray array2 = Nd4j.create(100).assign(2.0);
@@ -143,9 +140,8 @@ public class AveragingTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAccumulation2(Nd4jBackend backend) {
         INDArray array1 = Nd4j.create(100).assign(1.0);
         INDArray array2 = Nd4j.create(100).assign(2.0);
@@ -160,9 +156,8 @@ public class AveragingTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAccumulation3(Nd4jBackend backend) {
         // we want to ensure that cuda backend is able to launch this op on cpu
         Nd4j.getAffinityManager().allowCrossDeviceAccess(false);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/DataTypeTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/DataTypeTest.java
index 78b8f00dc..b08ec684e 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/DataTypeTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/DataTypeTest.java
@@ -39,9 +39,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 @Slf4j
 public class DataTypeTest extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDataTypes(Nd4jBackend backend) throws Exception {
         for (val type : DataType.values()) {
             if (DataType.UTF8.equals(type) || DataType.UNKNOWN.equals(type) || DataType.COMPRESSED.equals(type))
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/InputValidationTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/InputValidationTests.java
index f1a296783..881dc85c2 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/InputValidationTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/InputValidationTests.java
@@ -41,9 +41,8 @@ public class InputValidationTests extends BaseNd4jTestWithBackends {
     /////////////////////////////////////////////////////////////
     ///////////////////// Broadcast Tests ///////////////////////
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInvalidColVectorOp1(Nd4jBackend backend) {
         INDArray first = Nd4j.create(10, 10);
         INDArray col = Nd4j.create(5, 1);
@@ -55,9 +54,8 @@ public class InputValidationTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInvalidColVectorOp2(Nd4jBackend backend) {
         INDArray first = Nd4j.create(10, 10);
         INDArray col = Nd4j.create(5, 1);
@@ -69,9 +67,8 @@ public class InputValidationTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInvalidRowVectorOp1(Nd4jBackend backend) {
         INDArray first = Nd4j.create(10, 10);
         INDArray row = Nd4j.create(1, 5);
@@ -83,9 +80,8 @@ public class InputValidationTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInvalidRowVectorOp2(Nd4jBackend backend) {
         INDArray first = Nd4j.create(10, 10);
         INDArray row = Nd4j.create(1, 5);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/LoneTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/LoneTest.java
index d4fa89cf8..e49e91937 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/LoneTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/LoneTest.java
@@ -51,9 +51,8 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class LoneTest extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSoftmaxStability(Nd4jBackend backend) {
         INDArray input = Nd4j.create(new double[]{-0.75, 0.58, 0.42, 1.03, -0.61, 0.19, -0.37, -0.40, -1.42, -0.04}).reshape(1, -1).transpose();
 //        System.out.println("Input transpose " + Shape.shapeToString(input.shapeInfo()));
@@ -67,9 +66,8 @@ public class LoneTest extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFlattenedView(Nd4jBackend backend) {
         int rows = 8;
         int cols = 8;
@@ -105,9 +103,8 @@ public class LoneTest extends BaseNd4jTestWithBackends {
         assertEquals(fAssertion, Nd4j.toFlattened('f', first));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIndexingColVec(Nd4jBackend backend) {
         int elements = 5;
         INDArray rowVector = Nd4j.linspace(1, elements, elements).reshape(1, elements);
@@ -126,9 +123,8 @@ public class LoneTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void concatScalarVectorIssue(Nd4jBackend backend) {
         //A bug was found when the first array that concat sees is a scalar and the rest vectors + scalars
         INDArray arr1 = Nd4j.create(1, 1);
@@ -138,9 +134,8 @@ public class LoneTest extends BaseNd4jTestWithBackends {
         assertTrue(arr4.sumNumber().floatValue() <= Nd4j.EPS_THRESHOLD);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void reshapeTensorMmul(Nd4jBackend backend) {
         INDArray a = Nd4j.linspace(1, 2, 12).reshape(2, 3, 2);
         INDArray b = Nd4j.linspace(3, 4, 4).reshape(2, 2);
@@ -152,9 +147,8 @@ public class LoneTest extends BaseNd4jTestWithBackends {
         INDArray c = Nd4j.tensorMmul(b, a, axes);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void maskWhenMerge(Nd4jBackend backend) {
         DataSet dsA = new DataSet(Nd4j.linspace(1, 15, 15).reshape(1, 3, 5), Nd4j.zeros(1, 3, 5));
         DataSet dsB = new DataSet(Nd4j.linspace(1, 9, 9).reshape(1, 3, 3), Nd4j.zeros(1, 3, 3));
@@ -169,9 +163,8 @@ public class LoneTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRelu(Nd4jBackend backend) {
         INDArray aA = Nd4j.linspace(-3, 4, 8).reshape(2, 4);
         INDArray aD = Nd4j.linspace(-3, 4, 8).reshape(2, 4);
@@ -197,9 +190,8 @@ public class LoneTest extends BaseNd4jTestWithBackends {
         assertEquals(max - 1, currentArgMax);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRPF(Nd4jBackend backend) {
         val array = Nd4j.createFromArray(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12).reshape(2, 2, 3);
 
@@ -212,9 +204,8 @@ public class LoneTest extends BaseNd4jTestWithBackends {
         log.info("TAD:\n{}", tad);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcat3D_Vstack_C(Nd4jBackend backend) {
         val shape = new long[]{1, 1000, 20};
 
@@ -244,9 +235,8 @@ public class LoneTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetRow1(Nd4jBackend backend) {
         INDArray array = Nd4j.create(10000, 10000);
 
@@ -285,9 +275,8 @@ public class LoneTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void checkSliceofSlice(Nd4jBackend backend) {
         /*
             Issue 1: Slice of slice with c order and f order views are not equal
@@ -327,9 +316,8 @@ public class LoneTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void checkWithReshape(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(1, 3);
         INDArray reshaped = arr.reshape('f', 3, 1);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/MmulBug.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/MmulBug.java
index dfd7e6c7b..f0296812d 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/MmulBug.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/MmulBug.java
@@ -38,9 +38,8 @@ public class MmulBug extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void simpleTest(Nd4jBackend backend) {
         INDArray m1 = Nd4j.create(new double[][] {{1.0}, {2.0}, {3.0}, {4.0}});
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/NDArrayTestsFortran.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/NDArrayTestsFortran.java
index 8667fda85..8891d569b 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/NDArrayTestsFortran.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/NDArrayTestsFortran.java
@@ -63,9 +63,8 @@ import static org.junit.jupiter.api.Assertions.*;
 @Slf4j
 public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarOps(Nd4jBackend backend) {
         INDArray n = Nd4j.create(Nd4j.ones(27).data(), new long[] {3, 3, 3});
         assertEquals(27d, n.length(), 1e-1);
@@ -83,9 +82,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testColumnMmul(Nd4jBackend backend) {
         DataBuffer data = Nd4j.linspace(1, 10, 18, DataType.FLOAT).data();
         INDArray x2 = Nd4j.create(data, new long[] {2, 3, 3});
@@ -116,9 +114,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRowVectorGemm(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(1, -1).castTo(DataType.DOUBLE);
         INDArray other = Nd4j.linspace(1, 16, 16, DataType.DOUBLE).reshape(4, 4).castTo(DataType.DOUBLE);
@@ -129,18 +126,16 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRepmat(Nd4jBackend backend) {
         INDArray rowVector = Nd4j.create(1, 4);
         INDArray repmat = rowVector.repmat(4, 4);
         assertTrue(Arrays.equals(new long[] {4, 16}, repmat.shape()));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReadWrite() throws Exception {
         INDArray write = Nd4j.linspace(1, 4, 4, DataType.DOUBLE);
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -155,9 +150,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReadWriteDouble() throws Exception {
         INDArray write = Nd4j.linspace(1, 4, 4, DataType.FLOAT);
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -173,9 +167,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultiThreading() throws Exception {
         ExecutorService ex = ExecutorServiceProvider.getExecutorService();
 
@@ -195,9 +188,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastingGenerated(Nd4jBackend backend) {
         int[][] broadcastShape = NDArrayCreationUtil.getRandomBroadCastShape(7, 6, 10);
         List<List<Pair<INDArray, String>>> broadCastList = new ArrayList<>(broadcastShape.length);
@@ -222,9 +214,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadCasting(Nd4jBackend backend) {
         INDArray first = Nd4j.arange(0, 3).reshape(3, 1).castTo(DataType.DOUBLE);
         INDArray ret = first.broadcast(3, 4);
@@ -237,18 +228,16 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOneTensor(Nd4jBackend backend) {
         INDArray arr = Nd4j.ones(1, 1, 1, 1, 1, 1, 1);
         INDArray matrixToBroadcast = Nd4j.ones(1, 1);
         assertEquals(matrixToBroadcast.broadcast(arr.shape()), arr);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSortWithIndicesDescending(Nd4jBackend backend) {
         INDArray toSort = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         //indices,data
@@ -259,9 +248,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
         assertEquals(shouldIndex, sorted[0],getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSortDeadlock(Nd4jBackend backend) {
         val toSort = Nd4j.linspace(DataType.DOUBLE, 1, 32*768, 1).reshape(32, 768);
 
@@ -269,9 +257,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSortWithIndices(Nd4jBackend backend) {
         INDArray toSort = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         //indices,data
@@ -282,18 +269,16 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
         assertEquals(shouldIndex, sorted[0],getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNd4jSortScalar(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 8, 8, DataType.DOUBLE).reshape(1, -1);
         INDArray sorted = Nd4j.sort(linspace, 1, false);
 //        System.out.println(sorted);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSwapAxesFortranOrder(Nd4jBackend backend) {
         INDArray n = Nd4j.create(Nd4j.linspace(1, 30, 30, DataType.DOUBLE).data(), new long[] {3, 5, 2}).castTo(DataType.DOUBLE);
         for (int i = 0; i < n.slices(); i++) {
@@ -312,9 +297,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDimShuffle(Nd4jBackend backend) {
         INDArray n = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray twoOneTwo = n.dimShuffle(new Object[] {0, 'x', 1}, new int[] {0, 1}, new boolean[] {false, false});
@@ -325,9 +309,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetVsGetScalar(Nd4jBackend backend) {
         INDArray a = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         float element = a.getFloat(0, 1);
@@ -340,9 +323,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDivide(Nd4jBackend backend) {
         INDArray two = Nd4j.create(new float[] {2, 2, 2, 2});
         INDArray div = two.div(two);
@@ -356,9 +338,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSigmoid(Nd4jBackend backend) {
         INDArray n = Nd4j.create(new float[] {1, 2, 3, 4});
         INDArray assertion = Nd4j.create(new float[] {0.73105858f, 0.88079708f, 0.95257413f, 0.98201379f});
@@ -367,9 +348,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNeg(Nd4jBackend backend) {
         INDArray n = Nd4j.create(new float[] {1, 2, 3, 4});
         INDArray assertion = Nd4j.create(new float[] {-1, -2, -3, -4});
@@ -379,9 +359,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCosineSim(Nd4jBackend backend) {
         INDArray vec1 = Nd4j.create(new double[] {1, 2, 3, 4});
         INDArray vec2 = Nd4j.create(new double[] {1, 2, 3, 4});
@@ -396,9 +375,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testExp(Nd4jBackend backend) {
         INDArray n = Nd4j.create(new double[] {1, 2, 3, 4});
         INDArray assertion = Nd4j.create(new double[] {2.71828183f, 7.3890561f, 20.08553692f, 54.59815003f});
@@ -408,9 +386,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalar(Nd4jBackend backend) {
         INDArray a = Nd4j.scalar(1.0f);
         assertEquals(true, a.isScalar());
@@ -422,9 +399,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWrap(Nd4jBackend backend) {
         int[] shape = {2, 4};
         INDArray d = Nd4j.linspace(1, 8, 8, DataType.DOUBLE).reshape(shape[0], shape[1]);
@@ -449,9 +425,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
         assertEquals(row22.columns(), 2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetRowFortran(Nd4jBackend backend) {
         INDArray n = Nd4j.create(Nd4j.linspace(1, 4, 4, DataType.FLOAT).data(), new long[] {2, 2});
         INDArray column = Nd4j.create(new float[] {1, 3});
@@ -464,9 +439,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetColumnFortran(Nd4jBackend backend) {
         INDArray n = Nd4j.create(Nd4j.linspace(1, 4, 4, DataType.DOUBLE).data(), new long[] {2, 2});
         INDArray column = Nd4j.create(new double[] {1, 2});
@@ -480,9 +454,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetColumns(Nd4jBackend backend) {
         INDArray matrix = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(2, 3).castTo(DataType.DOUBLE);
 //        log.info("Original: {}", matrix);
@@ -496,9 +469,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVectorInit(Nd4jBackend backend) {
         DataBuffer data = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).data();
         INDArray arr = Nd4j.create(data, new long[] {1, 4});
@@ -511,9 +483,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAssignOffset(Nd4jBackend backend) {
         INDArray arr = Nd4j.ones(5, 5);
         INDArray row = arr.slice(1);
@@ -521,9 +492,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.ones(5), row);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testColumns(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new long[] {3, 2}).castTo(DataType.DOUBLE);
         INDArray column = Nd4j.create(new double[] {1, 2, 3});
@@ -561,9 +531,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPutRow(Nd4jBackend backend) {
         INDArray d = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray n = d.dup();
@@ -622,9 +591,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInplaceTranspose(Nd4jBackend backend) {
         INDArray test = Nd4j.rand(3, 4);
         INDArray orig = test.dup();
@@ -639,9 +607,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmulF(Nd4jBackend backend) {
 
         DataBuffer data = Nd4j.linspace(1, 10, 10, DataType.DOUBLE).data();
@@ -659,9 +626,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRowsColumns(Nd4jBackend backend) {
         DataBuffer data = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).data();
         INDArray rows = Nd4j.create(data, new long[] {2, 3});
@@ -677,9 +643,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTranspose(Nd4jBackend backend) {
         INDArray n = Nd4j.create(Nd4j.ones(100).castTo(DataType.DOUBLE).data(), new long[] {5, 5, 4});
         INDArray transpose = n.transpose();
@@ -707,9 +672,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAddMatrix(Nd4jBackend backend) {
         INDArray five = Nd4j.ones(5);
         five.addi(five.dup());
@@ -720,9 +684,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMMul(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new double[][] {{1, 2, 3}, {4, 5, 6}});
 
@@ -733,9 +696,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPutSlice(Nd4jBackend backend) {
         INDArray n = Nd4j.linspace(1, 27, 27, DataType.DOUBLE).reshape(3, 3, 3);
         INDArray newSlice = Nd4j.create(DataType.DOUBLE, 3, 3);
@@ -746,9 +708,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRowVectorMultipleIndices(Nd4jBackend backend) {
         INDArray linear = Nd4j.create(DataType.DOUBLE, 1, 4);
         linear.putScalar(new long[] {0, 1}, 1);
@@ -757,9 +718,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDim1(Nd4jBackend backend) {
         INDArray sum = Nd4j.linspace(1, 2, 2, DataType.DOUBLE).reshape(2, 1);
         INDArray same = sum.dup();
@@ -767,9 +727,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEps(Nd4jBackend backend) {
         val ones = Nd4j.ones(5);
         val res = Nd4j.createUninitialized(DataType.BOOL, 5);
@@ -777,9 +736,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLogDouble(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).castTo(DataType.DOUBLE);
         INDArray log = Transforms.log(linspace);
@@ -787,36 +745,32 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
         assertEquals(assertion, log);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVectorSum(Nd4jBackend backend) {
         INDArray lin = Nd4j.linspace(1, 4, 4, DataType.DOUBLE);
         assertEquals(10.0, lin.sumNumber().doubleValue(), 1e-1);
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVectorSum2(Nd4jBackend backend) {
         INDArray lin = Nd4j.create(new double[] {1, 2, 3, 4});
         assertEquals(10.0, lin.sumNumber().doubleValue(), 1e-1);
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVectorSum3(Nd4jBackend backend) {
         INDArray lin = Nd4j.create(new double[] {1, 2, 3, 4});
         INDArray lin2 = Nd4j.create(new double[] {1, 2, 3, 4});
         assertEquals(lin, lin2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSmallSum(Nd4jBackend backend) {
         INDArray base = Nd4j.create(new double[] {5.843333333333335, 3.0540000000000007});
         base.addi(1e-12);
@@ -827,9 +781,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPermute(Nd4jBackend backend) {
         INDArray n = Nd4j.create(Nd4j.linspace(1, 20, 20, DataType.DOUBLE).data(), new long[] {5, 4});
         INDArray transpose = n.transpose();
@@ -858,9 +811,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAppendBias(Nd4jBackend backend) {
         INDArray rand = Nd4j.linspace(1, 25, 25, DataType.DOUBLE).reshape(1, -1).transpose();
         INDArray test = Nd4j.appendBias(rand);
@@ -868,9 +820,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
         assertEquals(assertion, test);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRand(Nd4jBackend backend) {
         INDArray rand = Nd4j.randn(5, 5);
         Nd4j.getDistributions().createUniform(0.4, 4).sample(5);
@@ -882,9 +833,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIdentity(Nd4jBackend backend) {
         INDArray eye = Nd4j.eye(5);
         assertTrue(Arrays.equals(new long[] {5, 5}, eye.shape()));
@@ -895,9 +845,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testColumnVectorOpsFortran(Nd4jBackend backend) {
         INDArray twoByTwo = Nd4j.create(new float[] {1, 2, 3, 4}, new long[] {2, 2});
         INDArray toAdd = Nd4j.create(new float[] {1, 2}, new long[] {2, 1});
@@ -908,9 +857,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRSubi(Nd4jBackend backend) {
         INDArray n2 = Nd4j.ones(2);
         INDArray n2Assertion = Nd4j.zeros(2);
@@ -920,9 +868,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAssign(Nd4jBackend backend) {
         INDArray vector = Nd4j.linspace(1, 5, 5, DataType.DOUBLE);
         vector.assign(1);
@@ -939,9 +886,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
         assertEquals(tensor, ones);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAddScalar(Nd4jBackend backend) {
         INDArray div = Nd4j.valueArrayOf(new long[] {1, 4}, 4.0);
         INDArray rdiv = div.add(1);
@@ -949,9 +895,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
         assertEquals(answer, rdiv);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRdivScalar(Nd4jBackend backend) {
         INDArray div = Nd4j.valueArrayOf(new long[] {1, 4}, 4.0);
         INDArray rdiv = div.rdiv(1);
@@ -959,9 +904,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
         assertEquals(rdiv, answer);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRDivi(Nd4jBackend backend) {
         INDArray n2 = Nd4j.valueArrayOf(new long[] {1, 2}, 4.0);
         INDArray n2Assertion = Nd4j.valueArrayOf(new long[] {1, 2}, 0.5);
@@ -971,9 +915,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNumVectorsAlongDimension(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 24, 24, DataType.DOUBLE).reshape(4, 3, 2);
         assertEquals(12, arr.vectorsAlongDimension(2));
@@ -981,9 +924,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadCast(Nd4jBackend backend) {
         INDArray n = Nd4j.linspace(1, 4, 4, DataType.DOUBLE);
         INDArray broadCasted = n.broadcast(5, 4);
@@ -1005,9 +947,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
         assertTrue(Arrays.equals(new long[] {1, 2, 36, 36}, broadCasted3.shape()));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatrix(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new double[] {1, 2, 3, 4}, new long[] {2, 2});
         INDArray brr = Nd4j.create(new double[] {5, 6}, new long[] {2});
@@ -1017,9 +958,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPutRowGetRowOrdering(Nd4jBackend backend) {
         INDArray row1 = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray put = Nd4j.create(new double[] {5, 6});
@@ -1041,9 +981,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSumWithRow1(Nd4jBackend backend) {
         //Works:
         INDArray array2d = Nd4j.ones(1, 10);
@@ -1074,9 +1013,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
         array5d.sum(4); //java.lang.IllegalArgumentException: Illegal index 10000 derived from 9 with offset of 1000 and stride of 1000
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSumWithRow2(Nd4jBackend backend) {
         //All sums in this method execute without exceptions.
         INDArray array3d = Nd4j.ones(2, 10, 10);
@@ -1099,9 +1037,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPutRowFortran(Nd4jBackend backend) {
         INDArray row1 = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2).castTo(DataType.DOUBLE);
         INDArray put = Nd4j.create(new double[] {5, 6});
@@ -1114,9 +1051,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testElementWiseOps(Nd4jBackend backend) {
         INDArray n1 = Nd4j.scalar(1);
         INDArray n2 = Nd4j.scalar(2);
@@ -1139,9 +1075,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRollAxis(Nd4jBackend backend) {
         INDArray toRoll = Nd4j.ones(3, 4, 5, 6);
         assertArrayEquals(new long[] {3, 6, 4, 5}, Nd4j.rollAxis(toRoll, 3, 1).shape());
@@ -1163,9 +1098,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNegativeShape(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 4, 4, DataType.DOUBLE);
         INDArray reshaped = linspace.reshape(-1, 2);
@@ -1177,9 +1111,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetColumnGetRow(Nd4jBackend backend) {
         INDArray row = Nd4j.ones(1, 5);
         for (int i = 0; i < 5; i++) {
@@ -1194,9 +1127,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDupAndDupWithOrder(Nd4jBackend backend) {
         List<Pair<INDArray, String>> testInputs = NDArrayCreationUtil.getAllTestMatricesWithShape(4, 5, 123, DataType.DOUBLE);
         int count = 0;
@@ -1218,9 +1150,8 @@ public class NDArrayTestsFortran extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToOffsetZeroCopy(Nd4jBackend backend) {
         List<Pair<INDArray, String>> testInputs = NDArrayCreationUtil.getAllTestMatricesWithShape(4, 5, 123, DataType.DOUBLE);
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsC.java
index 9c7482b0b..7e318cb06 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsC.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsC.java
@@ -176,18 +176,16 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         Nd4j.setDataType(initialType);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArangeNegative(Nd4jBackend backend) {
         INDArray arr = Nd4j.arange(-2,2).castTo(DataType.DOUBLE);
         INDArray assertion = Nd4j.create(new double[]{-2, -1,  0,  1});
         assertEquals(assertion,arr);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTri(Nd4jBackend backend) {
         INDArray assertion = Nd4j.create(new double[][]{
                 {1,1,1,0,0},
@@ -200,9 +198,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTriu(Nd4jBackend backend) {
         INDArray input = Nd4j.linspace(1,12,12, DataType.DOUBLE).reshape(4,3);
         int k = -1;
@@ -217,17 +214,15 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(test,create);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDiag(Nd4jBackend backend) {
         INDArray diag = Nd4j.diag(Nd4j.linspace(1,4,4, DataType.DOUBLE).reshape(4,1));
         assertArrayEquals(new long[] {4,4},diag.shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetRowEdgeCase(Nd4jBackend backend) {
         INDArray orig = Nd4j.linspace(1,300,300, DataType.DOUBLE).reshape('c', 100, 3);
         INDArray col = orig.getColumn(0).reshape(100, 1);
@@ -247,9 +242,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNd4jEnvironment(Nd4jBackend backend) {
         System.out.println(Nd4j.getExecutioner().getEnvironmentInformation());
         int manualNumCores = Integer.parseInt(Nd4j.getExecutioner().getEnvironmentInformation()
@@ -259,9 +253,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         System.out.println(Nd4jEnvironment.getEnvironment());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSerialization(@TempDir Path testDir) throws Exception {
         Nd4j.getRandom().setSeed(12345);
         INDArray arr = Nd4j.rand(1, 20);
@@ -285,9 +278,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(in, inDup); //Fails
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTensorAlongDimension2(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new float[100], new long[] {50, 1, 2});
         assertArrayEquals(new long[] {1, 2}, array.slice(0, 0).shape());
@@ -295,9 +287,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
     @Disabled // with broadcastables mechanic it'll be ok
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testShapeEqualsOnElementWise(Nd4jBackend backend) {
         assertThrows(IllegalStateException.class,() -> {
             Nd4j.ones(10000, 1).sub(Nd4j.ones(1, 2));
@@ -305,9 +296,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         });
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIsMaxVectorCase(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new double[] {1, 2, 4, 3}, new long[] {2, 2});
         INDArray assertion = Nd4j.create(new boolean[] {false, false, true, false}, new long[] {2, 2}, DataType.BOOL);
@@ -315,9 +305,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, test);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArgMax(Nd4jBackend backend) {
         INDArray toArgMax = Nd4j.linspace(1, 24, 24, DataType.DOUBLE).reshape(4, 3, 2);
         INDArray argMaxZero = Nd4j.argMax(toArgMax, 0);
@@ -332,9 +321,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(valueArrayThree, argMaxTwo);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArgMax_119(Nd4jBackend backend) {
         val array = Nd4j.create(new double[]{1, 2, 119, 2});
         val max = array.argMax();
@@ -343,9 +331,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(2L, max.getInt(0));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAutoBroadcastShape(Nd4jBackend backend) {
         val assertion = new long[]{2,2,2,5};
         val shapeTest = Shape.broadcastOutputShape(new long[]{2,1,2,1},new long[]{2,1,5});
@@ -362,9 +349,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion,test);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAudoBroadcastAddMatrix(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1,4,4, DataType.DOUBLE).reshape(2,2);
         INDArray row = Nd4j.ones(1, 2);
@@ -373,9 +359,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion,test);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarOps(Nd4jBackend backend) {
         INDArray n = Nd4j.create(Nd4j.ones(27).data(), new long[] {3, 3, 3});
         assertEquals(27d, n.length(), 1e-1);
@@ -391,9 +376,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTensorAlongDimension(Nd4jBackend backend) {
         val shape = new long[] {4, 5, 7};
         int length = ArrayUtil.prod(shape);
@@ -417,9 +401,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmulWithTranspose(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1,4,4, DataType.DOUBLE).reshape(2,2);
         INDArray arr2 = Nd4j.linspace(1,4,4, DataType.DOUBLE).reshape(2,2).transpose();
@@ -442,9 +425,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetDouble(Nd4jBackend backend) {
         INDArray n2 = Nd4j.create(Nd4j.linspace(1, 30, 30, DataType.DOUBLE).data(), new long[] {3, 5, 2});
         INDArray swapped = n2.swapAxes(n2.shape().length - 1, 1);
@@ -453,9 +435,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, slice0);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWriteTxt() throws Exception {
         INDArray row = Nd4j.create(new double[][] {{1, 2}, {3, 4}});
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -466,9 +447,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test2dMatrixOrderingSwitch(Nd4jBackend backend) {
         char order = Nd4j.order();
         INDArray c = Nd4j.create(new double[][] {{1, 2}, {3, 4}}, 'c');
@@ -479,9 +459,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(order, Nd4j.order().charValue());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatrix(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new float[] {1, 2, 3, 4}, new long[] {2, 2});
         INDArray brr = Nd4j.create(new float[] {5, 6}, new long[] {2});
@@ -491,9 +470,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMMul(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new double[][] {{1, 2, 3}, {4, 5, 6}});
 
@@ -520,9 +498,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSubiRowVector(Nd4jBackend backend) {
         INDArray oneThroughFour = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape('c', 2, 2);
         INDArray row1 = oneThroughFour.getRow(1).dup();
@@ -533,9 +510,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAddiRowVectorWithScalar(Nd4jBackend backend) {
         INDArray colVector = Nd4j.create(5, 1).assign(0.0);
         INDArray scalar = Nd4j.create(1, 1).assign(0.0);
@@ -548,9 +524,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
             assertEquals(colVector.getDouble(i), 1.0, 0.0);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTADOnVector(Nd4jBackend backend) {
 
         Nd4j.getRandom().setSeed(12345);
@@ -575,9 +550,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(5, colVec.getDouble(2), 0.0);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLength(Nd4jBackend backend) {
         INDArray values = Nd4j.create(2, 2);
         INDArray values2 = Nd4j.create(2, 2);
@@ -601,9 +575,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(expected, results);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadCasting(Nd4jBackend backend) {
         INDArray first = Nd4j.arange(0, 3).reshape(3, 1).castTo(DataType.DOUBLE);
         INDArray ret = first.broadcast(3, 4);
@@ -616,9 +589,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetColumns(Nd4jBackend backend) {
         INDArray matrix = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(2, 3);
         INDArray matrixGet = matrix.getColumns(1, 2);
@@ -626,9 +598,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(matrixAssertion, matrixGet);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSort(Nd4jBackend backend) {
         INDArray toSort = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray ascending = Nd4j.sort(toSort.dup(), 1, true);
@@ -640,9 +611,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(columnSorted, sorted);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSortRows(Nd4jBackend backend) {
         int nRows = 10;
         int nCols = 5;
@@ -676,9 +646,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToFlattenedOrder(Nd4jBackend backend) {
         INDArray concatC = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape('c', 2, 2);
         INDArray concatF = Nd4j.create(new long[] {2, 2}, 'f');
@@ -693,9 +662,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testZero(Nd4jBackend backend) {
         Nd4j.ones(11).sumNumber();
         Nd4j.ones(12).sumNumber();
@@ -703,9 +671,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSumNumberRepeatability(Nd4jBackend backend) {
         INDArray arr = Nd4j.ones(1, 450).reshape('c', 150, 3);
 
@@ -719,9 +686,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToFlattened2(Nd4jBackend backend) {
         int rows = 3;
         int cols = 4;
@@ -762,9 +728,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
                 Nd4j.toFlattened('f', c2d, f2d, c3d, f3d, c4d, f4d));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToFlattenedOnViews(Nd4jBackend backend) {
         int rows = 8;
         int cols = 8;
@@ -812,9 +777,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIsMax2(Nd4jBackend backend) {
         //Tests: full buffer...
         //1d
@@ -842,9 +806,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp2d, out2df);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToFlattened3(Nd4jBackend backend) {
         INDArray inC1 = Nd4j.create(new long[] {10, 100}, 'c');
         INDArray inC2 = Nd4j.create(new long[] {1, 100}, 'c');
@@ -866,9 +829,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         Nd4j.toFlattened('c', inC2); //ok
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIsMaxEqualValues(Nd4jBackend backend) {
         //Assumption here: should only have a 1 for *first* maximum value, if multiple values are exactly equal
 
@@ -883,36 +845,32 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.create(new boolean[] {false, false, false, true, false, false}), Transforms.isMax(Nd4j.create(new double[] {0, 0, 0, 2, 2, 0}), DataType.BOOL));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIMaxVector_1(Nd4jBackend backend) {
         val array = Nd4j.ones(3);
         val idx = array.argMax(0).getInt(0);
         assertEquals(0, idx);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIMaxVector_2(Nd4jBackend backend) {
         val array = Nd4j.ones(3);
         val idx = array.argMax(Integer.MAX_VALUE).getInt(0);
         assertEquals(0, idx);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIMaxVector_3(Nd4jBackend backend) {
         val array = Nd4j.ones(3);
         val idx = array.argMax().getInt(0);
         assertEquals(0, idx);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIsMaxEqualValues_2(Nd4jBackend backend) {
         //[0 2]    [0 1]
         //[2 1] -> [0 0]bg
@@ -928,9 +886,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, outf);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIsMaxEqualValues_3(Nd4jBackend backend) {
         //[0 2]    [0 1]
         //[2 1] -> [0 0]
@@ -943,9 +900,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, outf);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSqrt_1(Nd4jBackend backend) {
         val x = Nd4j.createFromArray(9.0, 9.0, 9.0, 9.0);
         val x2 = Nd4j.createFromArray(9.0, 9.0, 9.0, 9.0);
@@ -961,9 +917,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAssign_CF(Nd4jBackend backend) {
         val orig = Nd4j.create(new double[][] {{0, 2}, {2, 1}});
         val oc = orig.dup('c');
@@ -973,9 +928,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(orig, of);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIsMaxAlongDimension(Nd4jBackend backend) {
         //1d: row vector
         INDArray orig = Nd4j.create(new double[] {1, 2, 3, 1}).reshape(1,4 );
@@ -1044,9 +998,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIMaxSingleDim1(Nd4jBackend backend) {
         INDArray orig2d = Nd4j.create(new double[][] {{1, 0, 2}, {2, 3, 1}});
 
@@ -1055,9 +1008,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 //        System.out.println("IMAx result: " + result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIsMaxSingleDim1(Nd4jBackend backend) {
         INDArray orig2d = Nd4j.create(new double[][] {{1, 0, 2}, {2, 3, 1}});
         INDArray alongDim0c_2d = Nd4j.getExecutioner().exec(new IsMax(orig2d.dup('c'), Nd4j.createUninitialized(DataType.BOOL, orig2d.shape()), 0))[0];
@@ -1070,9 +1022,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(expAlong0_2d, alongDim0c_2d);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastRepeated(Nd4jBackend backend) {
         INDArray z = Nd4j.create(1, 4, 4, 3);
         INDArray bias = Nd4j.create(1, 3);
@@ -1090,9 +1041,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVStackDifferentOrders(Nd4jBackend backend) {
         INDArray expected = Nd4j.linspace(1, 9, 9, DataType.DOUBLE).reshape(3, 3);
 
@@ -1115,9 +1065,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVStackEdgeCase(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 4, 4, DataType.DOUBLE);
         INDArray vstacked = Nd4j.vstack(arr);
@@ -1125,9 +1074,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEps3(Nd4jBackend backend) {
 
         INDArray first = Nd4j.linspace(1, 10, 10, DataType.DOUBLE);
@@ -1202,9 +1150,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIsMaxAlongDimensionSimple(Nd4jBackend backend) {
         //Simple test: when doing IsMax along a dimension, we expect all values to be either 0 or 1
         //Do IsMax along dims 0&1 for rank 2, along 0,1&2 for rank 3, etc
@@ -1240,9 +1187,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSortColumns(Nd4jBackend backend) {
         int nRows = 5;
         int nCols = 10;
@@ -1274,9 +1220,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAddVectorWithOffset(Nd4jBackend backend) {
         INDArray oneThroughFour = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray row1 = oneThroughFour.getRow(1);
@@ -1289,9 +1234,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLinearViewGetAndPut(Nd4jBackend backend) {
         INDArray test = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray linear = test.reshape(-1);
@@ -1303,9 +1247,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRowVectorGemm(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(1, 4);
         INDArray other = Nd4j.linspace(1, 16, 16, DataType.DOUBLE).reshape(4, 4);
@@ -1314,9 +1257,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemmStrided(){
 
         for( val x : new int[]{5, 1}) {
@@ -1348,9 +1290,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultiSum(Nd4jBackend backend) {
         /**
          * ([[[ 0.,  1.],
@@ -1401,9 +1342,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSum2dv2(Nd4jBackend backend) {
         INDArray in = Nd4j.linspace(1, 8, 8, DataType.DOUBLE).reshape('c', 2, 2, 2);
 
@@ -1424,9 +1364,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
     //Passes on 3.9:
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSum3Of4_2222(Nd4jBackend backend) {
         int[] shape = {2, 2, 2, 2};
         int length = ArrayUtil.prod(shape);
@@ -1450,9 +1389,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcast1d(Nd4jBackend backend) {
         int[] shape = {4, 3, 2};
         int[] toBroadcastDims = new int[] {0, 1, 2};
@@ -1509,9 +1447,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSum3Of4_3322(Nd4jBackend backend) {
         int[] shape = {3, 3, 2, 2};
         int length = ArrayUtil.prod(shape);
@@ -1535,9 +1472,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToFlattened(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         List<INDArray> concat = new ArrayList<>();
@@ -1552,9 +1488,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDup(Nd4jBackend backend) {
         for (int x = 0; x < 100; x++) {
             INDArray orig = Nd4j.linspace(1, 4, 4, DataType.DOUBLE);
@@ -1576,9 +1511,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSortWithIndicesDescending(Nd4jBackend backend) {
         INDArray toSort = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         //indices,data
@@ -1591,18 +1525,16 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetFromRowVector(Nd4jBackend backend) {
         INDArray matrix = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray rowGet = matrix.get(NDArrayIndex.point(0), NDArrayIndex.interval(0, 2));
         assertArrayEquals(new long[] {2}, rowGet.shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSubRowVector(Nd4jBackend backend) {
         INDArray matrix = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(2, 3);
         INDArray row = Nd4j.linspace(1, 3, 3, DataType.DOUBLE);
@@ -1621,9 +1553,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDimShuffle(Nd4jBackend backend) {
         INDArray n = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray twoOneTwo = n.dimShuffle(new Object[] {0, 'x', 1}, new int[] {0, 1}, new boolean[] {false, false});
@@ -1634,9 +1565,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetVsGetScalar(Nd4jBackend backend) {
         INDArray a = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         float element = a.getFloat(0, 1);
@@ -1649,9 +1579,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDivide(Nd4jBackend backend) {
         INDArray two = Nd4j.create(new double[] {2, 2, 2, 2});
         INDArray div = two.div(two);
@@ -1665,9 +1594,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSigmoid(Nd4jBackend backend) {
         INDArray n = Nd4j.create(new float[] {1, 2, 3, 4});
         INDArray assertion = Nd4j.create(new float[] {0.73105858f, 0.88079708f, 0.95257413f, 0.98201379f});
@@ -1675,9 +1603,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, sigmoid);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNeg(Nd4jBackend backend) {
         INDArray n = Nd4j.create(new float[] {1, 2, 3, 4});
         INDArray assertion = Nd4j.create(new float[] {-1, -2, -3, -4});
@@ -1686,9 +1613,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNorm2Double(Nd4jBackend backend) {
         DataType initialType = Nd4j.dataType();
         Nd4j.setDataType(DataType.DOUBLE);
@@ -1708,9 +1634,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNorm2(Nd4jBackend backend) {
         INDArray n = Nd4j.create(new float[] {1, 2, 3, 4});
         float assertion = 5.47722557505f;
@@ -1728,9 +1653,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCosineSim(Nd4jBackend backend) {
         INDArray vec1 = Nd4j.create(new double[] {1, 2, 3, 4});
         INDArray vec2 = Nd4j.create(new double[] {1, 2, 3, 4});
@@ -1745,9 +1669,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScal(Nd4jBackend backend) {
         double assertion = 2;
         INDArray answer = Nd4j.create(new double[] {2, 4, 6, 8});
@@ -1763,9 +1686,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testExp(Nd4jBackend backend) {
         INDArray n = Nd4j.create(new double[] {1, 2, 3, 4});
         INDArray assertion = Nd4j.create(new double[] {2.71828183f, 7.3890561f, 20.08553692f, 54.59815003f});
@@ -1777,9 +1699,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSlices(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(Nd4j.linspace(1, 24, 24, DataType.DOUBLE).data(), new long[] {4, 3, 2});
         for (int i = 0; i < arr.slices(); i++) {
@@ -1789,9 +1710,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalar(Nd4jBackend backend) {
         INDArray a = Nd4j.scalar(1.0f);
         assertEquals(true, a.isScalar());
@@ -1801,9 +1721,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertTrue(n.isScalar());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWrap(Nd4jBackend backend) {
         int[] shape = {2, 4};
         INDArray d = Nd4j.linspace(1, 8, 8, DataType.DOUBLE).reshape(shape[0], shape[1]);
@@ -1830,9 +1749,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVectorInit(Nd4jBackend backend) {
         DataBuffer data = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).data();
         INDArray arr = Nd4j.create(data, new long[] {1, 4});
@@ -1845,9 +1763,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testColumns(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new long[] {3, 2});
         INDArray column2 = arr.getColumn(0);
@@ -1888,9 +1805,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPutRow(Nd4jBackend backend) {
         INDArray d = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray slice1 = d.slice(1);
@@ -1957,9 +1873,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMulRowVector(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         arr.muliRowVector(Nd4j.linspace(1, 2, 2, DataType.DOUBLE));
@@ -1970,9 +1885,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSum(Nd4jBackend backend) {
         INDArray n = Nd4j.create(Nd4j.linspace(1, 8, 8, DataType.DOUBLE).data(), new long[] {2, 2, 2});
         INDArray test = Nd4j.create(new double[] {3, 7, 11, 15}, new long[] {2, 2});
@@ -1983,9 +1897,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInplaceTranspose(Nd4jBackend backend) {
         INDArray test = Nd4j.rand(3, 4);
         INDArray orig = test.dup();
@@ -1998,9 +1911,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTADMMul(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
         val shape = new long[] {4, 5, 7};
@@ -2028,9 +1940,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(mmul, mmulCopy);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTADMMulLeadingOne(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
         val shape = new long[] {1, 5, 7};
@@ -2060,9 +1971,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSum2(Nd4jBackend backend) {
         INDArray test = Nd4j.create(new float[] {1, 2, 3, 4}, new long[] {2, 2});
         INDArray sum = test.sum(1);
@@ -2073,9 +1983,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetIntervalEdgeCase(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -2119,9 +2028,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetIntervalEdgeCase2(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -2145,9 +2053,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmul(Nd4jBackend backend) {
         DataBuffer data = Nd4j.linspace(1, 10, 10, DataType.DOUBLE).data();
         INDArray n = Nd4j.create(data, new long[] {1, 10});
@@ -2214,9 +2121,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRowsColumns(Nd4jBackend backend) {
         DataBuffer data = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).data();
         INDArray rows = Nd4j.create(data, new long[] {2, 3});
@@ -2232,9 +2138,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTranspose(Nd4jBackend backend) {
         INDArray n = Nd4j.create(Nd4j.ones(100).data(), new long[] {5, 5, 4}).castTo(DataType.DOUBLE);
         INDArray transpose = n.transpose();
@@ -2257,9 +2162,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLogX1(Nd4jBackend backend) {
         INDArray x = Nd4j.create(10).assign(7);
 
@@ -2270,9 +2174,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, logX5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAddMatrix(Nd4jBackend backend) {
         INDArray five = Nd4j.ones(5);
         five.addi(five);
@@ -2282,9 +2185,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPutSlice(Nd4jBackend backend) {
         INDArray n = Nd4j.linspace(1, 27, 27, DataType.DOUBLE).reshape(3, 3, 3);
         INDArray newSlice = Nd4j.zeros(3, 3);
@@ -2294,9 +2196,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRowVectorMultipleIndices(Nd4jBackend backend) {
         INDArray linear = Nd4j.create(1, 4);
         linear.putScalar(new long[] {0, 1}, 1);
@@ -2317,9 +2218,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNullPointerDataBuffer(Nd4jBackend backend) {
         DataType initialType = Nd4j.dataType();
 
@@ -2335,9 +2235,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         Nd4j.setDataType(initialType);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEps(Nd4jBackend backend) {
         INDArray ones = Nd4j.ones(5);
         val res = Nd4j.create(DataType.BOOL, 5);
@@ -2347,9 +2246,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertTrue(res.all());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEps2(Nd4jBackend backend) {
 
         INDArray first = Nd4j.valueArrayOf(10, 1e-2); //0.01
@@ -2365,9 +2263,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertTrue(expAllZeros2.none());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLogDouble(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 6, 6, DataType.DOUBLE);
         INDArray log = Transforms.log(linspace);
@@ -2376,18 +2273,16 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, log);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDupDimension(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         assertEquals(arr.tensorAlongDimension(0, 1), arr.tensorAlongDimension(0, 1));
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIterator(Nd4jBackend backend) {
         INDArray x = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray repeated = x.repeat(1, 2);
@@ -2398,9 +2293,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
             assertEquals(vals[i], arrayIter.next().doubleValue(), 1e-1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTile(Nd4jBackend backend) {
         INDArray x = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray repeated = x.repeat(0, 2);
@@ -2416,9 +2310,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, tile);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNegativeOneReshape(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new double[] {0, 1, 2});
         INDArray newShape = arr.reshape(-1);
@@ -2426,9 +2319,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSmallSum(Nd4jBackend backend) {
         INDArray base = Nd4j.create(new double[] {5.843333333333335, 3.0540000000000007});
         base.addi(1e-12);
@@ -2438,9 +2330,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test2DArraySlice(Nd4jBackend backend) {
         INDArray array2D = Nd4j.ones(5, 7);
         /**
@@ -2492,9 +2383,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetRow(Nd4jBackend backend) {
         INDArray arr = Nd4j.ones(10, 4);
         for (int i = 0; i < 10; i++) {
@@ -2504,9 +2394,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetPermuteReshapeSub(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
 
@@ -2527,9 +2416,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPutAtIntervalIndexWithStride(Nd4jBackend backend) {
         INDArray n1 = Nd4j.create(3, 3).assign(0.0);
         INDArrayIndex[] indices = {NDArrayIndex.interval(0, 2, 3), NDArrayIndex.all()};
@@ -2538,9 +2426,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(expected, n1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMMulMatrixTimesColVector(Nd4jBackend backend) {
         //[1 1 1 1 1; 10 10 10 10 10; 100 100 100 100 100] x [1; 1; 1; 1; 1] = [5; 50; 500]
         INDArray matrix = Nd4j.ones(3, 5);
@@ -2555,9 +2442,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMMulMixedOrder(Nd4jBackend backend) {
         INDArray first = Nd4j.ones(5, 2);
         INDArray second = Nd4j.ones(2, 3);
@@ -2581,9 +2467,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFTimesCAddiRow(Nd4jBackend backend) {
 
         INDArray arrF = Nd4j.create(2, 3, 'f').assign(1.0);
@@ -2610,9 +2495,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmulGet(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345L);
         INDArray elevenByTwo = Nd4j.rand(new long[] {11, 2});
@@ -2629,9 +2513,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMMulRowColVectorMixedOrder(Nd4jBackend backend) {
         INDArray colVec = Nd4j.ones(5, 1);
         INDArray rowVec = Nd4j.ones(1, 3);
@@ -2654,9 +2537,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(outCF, Nd4j.ones(5, 3));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMMulFTimesC(Nd4jBackend backend) {
         int nRows = 3;
         int nCols = 3;
@@ -2681,9 +2563,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(fTimesC, cTimesC);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMMulColVectorRowVectorMixedOrder(Nd4jBackend backend) {
         INDArray colVec = Nd4j.ones(5, 1);
         INDArray rowVec = Nd4j.ones(1, 5);
@@ -2705,9 +2586,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertTrue(outCF.equals(Nd4j.ones(1, 1).muli(5)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPermute(Nd4jBackend backend) {
         INDArray n = Nd4j.create(Nd4j.linspace(1, 20, 20, DataType.DOUBLE).data(), new long[] {5, 4});
         INDArray transpose = n.transpose();
@@ -2722,9 +2602,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(permuted, assertion);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPermutei(Nd4jBackend backend) {
         //Check in-place permute vs. copy array permute
 
@@ -2805,9 +2684,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPermuteiShape(Nd4jBackend backend) {
 
         INDArray row = Nd4j.create(1, 10);
@@ -2841,9 +2719,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSwapAxes(Nd4jBackend backend) {
         INDArray n = Nd4j.create(Nd4j.linspace(0, 7, 8, DataType.DOUBLE).data(), new long[] {2, 2, 2});
         INDArray assertion = n.permute(2, 1, 0);
@@ -2861,9 +2738,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMuliRowVector(Nd4jBackend backend) {
         INDArray arrC = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape('c', 3, 2);
         INDArray arrF = Nd4j.create(new long[] {3, 2}, 'f').assign(arrC);
@@ -2888,9 +2764,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, outF);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSliceConstructor(Nd4jBackend backend) {
         List<INDArray> testList = new ArrayList<>();
         for (int i = 0; i < 5; i++)
@@ -2903,9 +2778,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStdev0(Nd4jBackend backend) {
         double[][] ind = {{5.1, 3.5, 1.4}, {4.9, 3.0, 1.4}, {4.7, 3.2, 1.3}};
         INDArray in = Nd4j.create(ind);
@@ -2915,9 +2789,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, stdev);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStdev1(Nd4jBackend backend) {
         double[][] ind = {{5.1, 3.5, 1.4}, {4.9, 3.0, 1.4}, {4.7, 3.2, 1.3}};
         INDArray in = Nd4j.create(ind);
@@ -2928,9 +2801,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSignXZ(Nd4jBackend backend) {
         double[] d = {1.0, -1.1, 1.2, 1.3, -1.4, -1.5, 1.6, -1.7, -1.8, -1.9, -1.01, -1.011};
         double[] e = {1.0, -1.0, 1.0, 1.0, -1.0, -1.0, 1.0, -1.0, -1.0, -1.0, -1.0, -1.0};
@@ -2964,9 +2836,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, zOutCF); //fails
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTanhXZ(Nd4jBackend backend) {
         INDArray arrC = Nd4j.linspace(-6, 6, 12, DataType.DOUBLE).reshape('c', 4, 3);
         INDArray arrF = Nd4j.create(new long[] {4, 3}, 'f').assign(arrC);
@@ -3001,9 +2872,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, zOutCF); //fails
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastDiv(Nd4jBackend backend) {
         INDArray num = Nd4j.create(new double[] {1.00, 1.00, 1.00, 1.00, 2.00, 2.00, 2.00, 2.00, 1.00, 1.00, 1.00, 1.00,
                 2.00, 2.00, 2.00, 2.00, -1.00, -1.00, -1.00, -1.00, -2.00, -2.00, -2.00, -2.00, -1.00, -1.00,
@@ -3021,9 +2891,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(expected, actual);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastDiv2(){
         INDArray arr = Nd4j.ones(DataType.DOUBLE, 1, 64, 125, 125).muli(2);
         INDArray vec = Nd4j.ones(DataType.DOUBLE, 64).muli(2);
@@ -3038,9 +2907,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastMult(Nd4jBackend backend) {
         INDArray num = Nd4j.create(new double[] {1.00, 2.00, 3.00, 4.00, 5.00, 6.00, 7.00, 8.00, -1.00, -2.00, -3.00,
                 -4.00, -5.00, -6.00, -7.00, -8.00}).reshape(2, 8);
@@ -3054,9 +2922,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(expected, actual);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastSub(Nd4jBackend backend) {
         INDArray num = Nd4j.create(new double[] {1.00, 2.00, 3.00, 4.00, 5.00, 6.00, 7.00, 8.00, -1.00, -2.00, -3.00,
                 -4.00, -5.00, -6.00, -7.00, -8.00}).reshape(2, 8);
@@ -3070,9 +2937,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(expected, actual);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastAdd(Nd4jBackend backend) {
         INDArray num = Nd4j.create(new double[] {1.00, 2.00, 3.00, 4.00, 5.00, 6.00, 7.00, 8.00, -1.00, -2.00, -3.00,
                 -4.00, -5.00, -6.00, -7.00, -8.00}).reshape(2, 8);
@@ -3086,9 +2952,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(expected, actual);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDimension(Nd4jBackend backend) {
         INDArray test = Nd4j.create(Nd4j.linspace(1, 4, 4, DataType.DOUBLE).data(), new long[] {2, 2});
         //row
@@ -3122,9 +2987,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReshape(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(Nd4j.linspace(1, 24, 24, DataType.DOUBLE).data(), new long[] {4, 3, 2});
         INDArray reshaped = arr.reshape(2, 3, 4);
@@ -3136,9 +3000,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDot() throws Exception {
         INDArray vec1 = Nd4j.create(new float[] {1, 2, 3, 4});
         INDArray vec2 = Nd4j.create(new float[] {1, 2, 3, 4});
@@ -3156,9 +3019,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(25, Nd4j.getBlasWrapper().dot(row, row), 1e-1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIdentity(Nd4jBackend backend) {
         INDArray eye = Nd4j.eye(5);
         assertTrue(Arrays.equals(new long[] {5, 5}, eye.shape()));
@@ -3166,9 +3028,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertTrue(Arrays.equals(new long[] {5, 5}, eye.shape()));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTemp(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
         INDArray in = Nd4j.rand(new long[] {2, 2, 2});
@@ -3185,9 +3046,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMeans(Nd4jBackend backend) {
         INDArray a = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray mean1 = a.mean(1);
@@ -3199,9 +3059,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSums(Nd4jBackend backend) {
         INDArray a = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         assertEquals(Nd4j.create(new double[] {3, 7}), a.sum(1),getFailureMessage());
@@ -3211,9 +3070,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRSubi(Nd4jBackend backend) {
         INDArray n2 = Nd4j.ones(2);
         INDArray n2Assertion = Nd4j.zeros(2);
@@ -3222,9 +3080,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcat(Nd4jBackend backend) {
         INDArray A = Nd4j.linspace(1, 8, 8, DataType.DOUBLE).reshape(2, 2, 2);
         INDArray B = Nd4j.linspace(1, 12, 12, DataType.DOUBLE).reshape(3, 2, 2);
@@ -3238,9 +3095,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcatHorizontally(Nd4jBackend backend) {
         INDArray rowVector = Nd4j.ones(1, 5);
         INDArray other = Nd4j.ones(1, 5);
@@ -3251,9 +3107,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArgMaxSameValues(Nd4jBackend backend) {
         //Here: assume that by convention, argmax returns the index of the FIRST maximum value
         //Thus, argmax(ones(...)) = 0 by convention
@@ -3267,9 +3122,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSoftmaxStability(Nd4jBackend backend) {
         INDArray input = Nd4j.create(new double[] {-0.75, 0.58, 0.42, 1.03, -0.61, 0.19, -0.37, -0.40, -1.42, -0.04}).reshape(1, -1).transpose();
 //        System.out.println("Input transpose " + Shape.shapeToString(input.shapeInfo()));
@@ -3278,9 +3132,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         Nd4j.getExecutioner().exec(new SoftMax(input, output));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAssignOffset(Nd4jBackend backend) {
         INDArray arr = Nd4j.ones(5, 5);
         INDArray row = arr.slice(1);
@@ -3288,9 +3141,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.ones(5), row);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAddScalar(Nd4jBackend backend) {
         INDArray div = Nd4j.valueArrayOf(new long[] {1, 4}, 4);
         INDArray rdiv = div.add(1);
@@ -3298,9 +3150,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(answer, rdiv);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRdivScalar(Nd4jBackend backend) {
         INDArray div = Nd4j.valueArrayOf(new long[] {1, 4}, 4).castTo(DataType.DOUBLE);
         INDArray rdiv = div.rdiv(1);
@@ -3308,9 +3159,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(rdiv, answer);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRDivi(Nd4jBackend backend) {
         INDArray n2 = Nd4j.valueArrayOf(new long[] {1, 2}, 4).castTo(DataType.DOUBLE);
         INDArray n2Assertion = Nd4j.valueArrayOf(new long[] {1, 2}, 0.5).castTo(DataType.DOUBLE);
@@ -3320,9 +3170,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testElementWiseAdd(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray linspace2 = linspace.dup();
@@ -3331,9 +3180,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, linspace);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSquareMatrix(Nd4jBackend backend) {
         INDArray n = Nd4j.create(Nd4j.linspace(1, 8, 8, DataType.DOUBLE).data(), new long[] {2, 2, 2});
         INDArray eightFirstTest = n.vectorAlongDimension(0, 2);
@@ -3346,9 +3194,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNumVectorsAlongDimension(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 24, 24, DataType.DOUBLE).reshape(4, 3, 2);
         assertEquals(12, arr.vectorsAlongDimension(2));
@@ -3356,9 +3203,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadCast(Nd4jBackend backend) {
         INDArray n = Nd4j.linspace(1, 4, 4, DataType.DOUBLE);
         INDArray broadCasted = n.broadcast(5, 4);
@@ -3387,9 +3233,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[] {2, 1, 1}, ones.shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarBroadcast(Nd4jBackend backend) {
         INDArray fiveThree = Nd4j.ones(5, 3);
         INDArray fiveThreeTest = Nd4j.scalar(1.0).broadcast(5, 3);
@@ -3398,9 +3243,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPutRowGetRowOrdering(Nd4jBackend backend) {
         INDArray row1 = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray put = Nd4j.create(new double[] {5, 6});
@@ -3421,9 +3265,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testElementWiseOps(Nd4jBackend backend) {
         INDArray n1 = Nd4j.scalar(1.0);
         INDArray n2 = Nd4j.scalar(2.0);
@@ -3444,9 +3287,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.scalar(1.333333333333333333333), div);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNdArrayCreation(Nd4jBackend backend) {
         double delta = 1e-1;
         INDArray n1 = Nd4j.create(new double[] {0d, 1d, 2d, 3d}, new long[] {2, 2}, 'c');
@@ -3457,9 +3299,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(3d, lv.getDouble(3), delta);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToFlattenedWithOrder(Nd4jBackend backend) {
         int[] firstShape = {10, 3};
         int firstLen = ArrayUtil.prod(firstShape);
@@ -3497,9 +3338,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLeakyRelu(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(-1, 1, 10, DataType.DOUBLE);
         double[] expected = new double[10];
@@ -3514,9 +3354,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSoftmaxRow(Nd4jBackend backend) {
         for (int i = 0; i < 20; i++) {
             INDArray arr1 = Nd4j.zeros(1, 100);
@@ -3525,9 +3364,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLeakyRelu2(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(-1, 1, 10, DataType.DOUBLE);
         double[] expected = new double[10];
@@ -3545,9 +3383,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDupAndDupWithOrder(Nd4jBackend backend) {
         List<Pair<INDArray, String>> testInputs =
                 NDArrayCreationUtil.getAllTestMatricesWithShape(ordering(), 4, 5, 123, DataType.DOUBLE);
@@ -3567,9 +3404,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToOffsetZeroCopy(Nd4jBackend backend) {
         List<Pair<INDArray, String>> testInputs =
                 NDArrayCreationUtil.getAllTestMatricesWithShape(ordering(), 4, 5, 123, DataType.DOUBLE);
@@ -3609,9 +3445,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         Nd4j.ones((1024 * 1024 * 511) + (1024 * 1024)); // Crashes
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAssignNumber(Nd4jBackend backend) {
         int nRows = 10;
         int nCols = 20;
@@ -3640,9 +3475,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSumDifferentOrdersSquareMatrix(Nd4jBackend backend) {
         INDArray arrc = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray arrf = Nd4j.create(new long[] {2, 2}, 'f').assign(arrc);
@@ -3683,9 +3517,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, arr2f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDummy(Nd4jBackend backend) {
         INDArray arr2f = Nd4j.create(new double[] {1.0, 13.0, 25.0, 37.0, 49.0, 61.0, 73.0, 85.0, 2.0, 14.0, 26.0, 38.0,
                 50.0, 62.0, 74.0, 86.0, 3.0, 15.0, 27.0, 39.0, 51.0, 63.0, 75.0, 87.0, 4.0, 16.0, 28.0, 40.0,
@@ -3711,9 +3544,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 //        log.info("arrayf data: {}", Arrays.toString(arrayf.data().asFloat()));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCreateDetached_1(Nd4jBackend backend) {
         val shape = new int[]{10};
         val dataTypes = new DataType[] {DataType.DOUBLE, DataType.BOOL, DataType.BYTE, DataType.UBYTE, DataType.SHORT, DataType.UINT16, DataType.INT, DataType.UINT32, DataType.LONG, DataType.UINT64, DataType.FLOAT, DataType.BFLOAT16, DataType.HALF};
@@ -3724,9 +3556,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCreateDetached_2(Nd4jBackend backend) {
         val shape = new long[]{10};
         val dataTypes = new DataType[] {DataType.DOUBLE, DataType.BOOL, DataType.BYTE, DataType.UBYTE, DataType.SHORT, DataType.UINT16, DataType.INT, DataType.UINT32, DataType.LONG, DataType.UINT64, DataType.FLOAT, DataType.BFLOAT16, DataType.HALF};
@@ -3737,9 +3568,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPairwiseMixedC(Nd4jBackend backend) {
         int[] shape2 = {12, 8};
         int length = ArrayUtil.prod(shape2);
@@ -3764,9 +3594,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertTrue(arrayNotEquals(arr2c.data().asFloat(), arr2f.data().asFloat(), 1e-5f));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPairwiseMixedF(Nd4jBackend backend) {
         int[] shape2 = {12, 8};
         int length = ArrayUtil.prod(shape2);
@@ -3791,9 +3620,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertTrue(arrayNotEquals(arr2c.data().asFloat(), arr2f.data().asFloat(), 1e-5f));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAssign2D(Nd4jBackend backend) {
         int[] shape2 = {8, 4};
 
@@ -3813,9 +3641,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, arr2f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAssign2D_2(Nd4jBackend backend) {
         int[] shape2 = {8, 4};
 
@@ -3843,9 +3670,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, z_c);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAssign3D_2(Nd4jBackend backend) {
         int[] shape3 = {8, 4, 8};
 
@@ -3867,9 +3693,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, arr3f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSumDifferentOrders(Nd4jBackend backend) {
         INDArray arrc = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape('c', 3, 2);
         INDArray arrf = Nd4j.create(new double[6], new long[] {3, 2}, 'f').assign(arrc);
@@ -3880,9 +3705,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(cSum, fSum); //Expect: 0.51, 1.79; getting [0.51,1.71] for f order
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCreateUnitialized(Nd4jBackend backend) {
 
         INDArray arrC = Nd4j.createUninitialized(new long[] {10, 10}, 'c');
@@ -3901,9 +3725,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.create(new long[] {10, 10}), arrF);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVarConst(Nd4jBackend backend) {
         INDArray x = Nd4j.linspace(1, 100, 100, DataType.DOUBLE).reshape(10, 10);
 //        System.out.println(x);
@@ -3947,9 +3770,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         b.transpose().var(1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVPull1(Nd4jBackend backend) {
         int indexes[] = new int[] {0, 2, 4};
         INDArray array = Nd4j.linspace(1, 25, 25, DataType.DOUBLE).reshape(5, 5);
@@ -4007,9 +3829,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVPull2(Nd4jBackend backend) {
         val indexes = new int[] {0, 2, 4};
         INDArray array = Nd4j.linspace(1, 25, 25, DataType.DOUBLE).reshape(5, 5);
@@ -4029,9 +3850,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCompareAndSet1(Nd4jBackend backend) {
         INDArray array = Nd4j.zeros(25);
 
@@ -4046,9 +3866,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, array);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReplaceNaNs(Nd4jBackend backend) {
         INDArray array = Nd4j.zeros(25);
         INDArray assertion = Nd4j.zeros(25);
@@ -4066,9 +3885,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, array);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNaNEquality(Nd4jBackend backend) {
         INDArray array = Nd4j.zeros(25);
         INDArray assertion = Nd4j.zeros(25);
@@ -4081,9 +3899,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSingleDeviceAveraging(Nd4jBackend backend) {
         int LENGTH = 512 * 1024 * 2;
         INDArray array1 = Nd4j.valueArrayOf(LENGTH, 1.0);
@@ -4125,9 +3942,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDistance1and2(Nd4jBackend backend) {
         double[] d1 = new double[] {-1, 3, 2};
         double[] d2 = new double[] {0, 1.5, -3.5};
@@ -4148,9 +3964,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(expD2 * expD2, arr1.squaredDistance(arr2), 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEqualsWithEps1(Nd4jBackend backend) {
         INDArray array1 = Nd4j.create(new double[] {0.5f, 1.5f, 2.5f, 3.5f, 4.5f});
         INDArray array2 = Nd4j.create(new double[] {0f, 1f, 2f, 3f, 4f});
@@ -4163,9 +3978,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(array2, array3);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIMaxIAMax(Nd4jBackend backend) {
         Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.ALL);
 
@@ -4181,9 +3995,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIMinIAMin(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new double[] {-0.24, -0.26, -0.07, -0.01});
         INDArray abs = Transforms.abs(arr);
@@ -4198,9 +4011,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcast3d2d(Nd4jBackend backend) {
         char[] orders = {'c', 'f'};
 
@@ -4248,9 +4060,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcast4d2d(Nd4jBackend backend) {
         char[] orders = {'c', 'f'};
 
@@ -4369,9 +4180,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIsMax2Of3d(Nd4jBackend backend) {
         double[][][] slices = new double[3][][];
         boolean[][][] isMax = new boolean[3][][];
@@ -4398,9 +4208,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(expected, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIsMax2of4d(Nd4jBackend backend) {
 
         Nd4j.getRandom().setSeed(12345);
@@ -4476,9 +4285,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, actF);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIMax2Of3d(Nd4jBackend backend) {
         double[][][] slices = new double[3][][];
 
@@ -4504,9 +4312,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIMax2of4d(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
         val s = new long[] {2, 3, 4, 5};
@@ -4579,9 +4386,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, actF);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTadPermuteEquals(Nd4jBackend backend) {
         INDArray d3c = Nd4j.linspace(1, 5, 5, DataType.DOUBLE).reshape('c', 1, 5, 1);
         INDArray d3f = d3c.dup('f');
@@ -4606,9 +4412,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(tadF, tadFi);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRemainder1(Nd4jBackend backend) {
         INDArray x = Nd4j.create(10).assign(5.3);
         INDArray y = Nd4j.create(10).assign(2.0);
@@ -4621,9 +4426,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFMod1(Nd4jBackend backend) {
         INDArray x = Nd4j.create(10).assign(5.3);
         INDArray y = Nd4j.create(10).assign(2.0);
@@ -4636,9 +4440,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStrangeDups1(Nd4jBackend backend) {
         INDArray array = Nd4j.create(10).assign(0);
         INDArray exp = Nd4j.create(10).assign(1.0f);
@@ -4653,9 +4456,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, copy);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStrangeDups2(Nd4jBackend backend) {
         INDArray array = Nd4j.create(10).assign(0);
         INDArray exp1 = Nd4j.create(10).assign(1.0f);
@@ -4671,9 +4473,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp2, copy);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReductionAgreement1(Nd4jBackend backend) {
         INDArray row = Nd4j.linspace(1, 3, 3, DataType.DOUBLE).reshape(1, 3);
         INDArray mean0 = row.mean(0);
@@ -4685,9 +4486,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSpecialConcat1(Nd4jBackend backend) {
         for (int i = 0; i < 10; i++) {
             List<INDArray> arrays = new ArrayList<>();
@@ -4707,9 +4507,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSpecialConcat2(Nd4jBackend backend) {
         List<INDArray> arrays = new ArrayList<>();
         for (int x = 0; x < 10; x++) {
@@ -4728,9 +4527,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPutScalar1(Nd4jBackend backend) {
         INDArray array = Nd4j.create(10, 3, 96, 96);
 
@@ -4740,9 +4538,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAveraging1(Nd4jBackend backend) {
         Nd4j.getAffinityManager().allowCrossDeviceAccess(false);
 
@@ -4760,9 +4557,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAveraging2(Nd4jBackend backend) {
 
         List<INDArray> arrays = new ArrayList<>();
@@ -4781,9 +4577,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAveraging3(Nd4jBackend backend) {
         Nd4j.getAffinityManager().allowCrossDeviceAccess(false);
 
@@ -4803,9 +4598,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testZ1(Nd4jBackend backend) {
         INDArray matrix = Nd4j.create(10, 10).assign(1.0);
 
@@ -4819,9 +4613,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, res);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDupDelayed(Nd4jBackend backend) {
         if (!(Nd4j.getExecutioner() instanceof GridExecutioner))
             return;
@@ -4871,9 +4664,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarReduction1(Nd4jBackend backend) {
         val op = new Norm2(Nd4j.create(1).assign(1.0));
         double norm2 = Nd4j.getExecutioner().execAndReturn(op).getFinalResult().doubleValue();
@@ -4888,9 +4680,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void tesAbsReductions1(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {-1, -2, -3, -4});
 
@@ -4898,9 +4689,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void tesAbsReductions2(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {-1, -2, -3, -4});
 
@@ -4908,9 +4698,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void tesAbsReductions3(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {-2, -2, 2, 2});
 
@@ -4918,9 +4707,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void tesAbsReductions4(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {-2, -2, 2, 3});
         assertEquals(1.0, array.sumNumber().doubleValue(), 1e-5);
@@ -4928,18 +4716,16 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(4, array.scan(Conditions.absGreaterThanOrEqual(0.0)).intValue());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void tesAbsReductions5(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {-2, 0.0, 2, 2});
 
         assertEquals(3, array.scan(Conditions.absGreaterThan(0.0)).intValue());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNewBroadcastComparison1(Nd4jBackend backend) {
         val initial = Nd4j.create(3, 5);
         val mask = Nd4j.create(new double[] {5, 4, 3, 2, 1});
@@ -4966,9 +4752,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNewBroadcastComparison2(Nd4jBackend backend) {
         val initial = Nd4j.create(3, 5);
         val mask = Nd4j.create(new double[] {5, 4, 3, 2, 1});
@@ -4992,9 +4777,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNewBroadcastComparison3(Nd4jBackend backend) {
         val initial = Nd4j.create(3, 5);
         val mask = Nd4j.create(new double[] {5, 4, 3, 2, 1});
@@ -5016,9 +4800,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNewBroadcastComparison4(Nd4jBackend backend) {
         val initial = Nd4j.create(3, 5);
         val mask = Nd4j.create(new double[] {5, 4, 3, 2, 1});
@@ -5040,9 +4823,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTadDup_1(Nd4jBackend backend) {
         INDArray haystack = Nd4j.create(new double[] {-0.84443557262, -0.06822254508, 0.74266910552, 0.61765557527, -0.77555125951,
                 -0.99536740779, -0.0257304441183, -0.6512106060, -0.345789492130, -1.25485503673,
@@ -5057,9 +4839,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(needle, drow);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTadReduce3_0(Nd4jBackend backend) {
         INDArray haystack = Nd4j.create(new double[] {-0.84443557262, -0.06822254508, 0.74266910552, 0.61765557527,
                 -0.77555125951, -0.99536740779, -0.0257304441183, -0.6512106060, -0.345789492130,
@@ -5080,9 +4861,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReduce3SignaturesEquality_1(Nd4jBackend backend) {
         val x = Nd4j.rand(DataType.DOUBLE, 3, 4, 5);
         val y = Nd4j.rand(DataType.DOUBLE, 3, 4, 5);
@@ -5096,9 +4876,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(z0, z1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTadReduce3_1(Nd4jBackend backend) {
         INDArray initial = Nd4j.create(5, 10);
         for (int i = 0; i < initial.rows(); i++) {
@@ -5116,9 +4895,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTadReduce3_2(Nd4jBackend backend) {
         INDArray initial = Nd4j.create(5, 10);
         for (int i = 0; i < initial.rows(); i++) {
@@ -5136,9 +4914,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTadReduce3_3(Nd4jBackend backend) {
         INDArray initial = Nd4j.create(5, 10);
         for (int i = 0; i < initial.rows(); i++) {
@@ -5157,9 +4934,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTadReduce3_3_NEG(Nd4jBackend backend) {
         INDArray initial = Nd4j.create(5, 10);
         for (int i = 0; i < initial.rows(); i++) {
@@ -5178,9 +4954,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTadReduce3_3_NEG_2(Nd4jBackend backend) {
         INDArray initial = Nd4j.create(5, 10);
         for (int i = 0; i < initial.rows(); i++) {
@@ -5214,9 +4989,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTadReduce3_4(Nd4jBackend backend) {
         INDArray initial = Nd4j.create(5, 6, 7);
         for (int i = 0; i < 5; i++) {
@@ -5235,9 +5009,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAtan2_1(Nd4jBackend backend) {
         INDArray x = Nd4j.create(10).assign(-1.0);
         INDArray y = Nd4j.create(10).assign(0.0);
@@ -5248,9 +5021,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAtan2_2(Nd4jBackend backend) {
         INDArray x = Nd4j.create(10).assign(1.0);
         INDArray y = Nd4j.create(10).assign(0.0);
@@ -5261,9 +5033,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testJaccardDistance1(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new double[] {0, 1, 0, 0, 1, 0});
         INDArray y = Nd4j.create(new double[] {1, 1, 0, 1, 0, 0});
@@ -5273,9 +5044,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(0.75, val, 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testJaccardDistance2(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new double[] {0, 1, 0, 0, 1, 1});
         INDArray y = Nd4j.create(new double[] {1, 1, 0, 1, 0, 0});
@@ -5285,9 +5055,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(0.8, val, 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testHammingDistance1(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new double[] {0, 0, 0, 1, 0, 0});
         INDArray y = Nd4j.create(new double[] {0, 0, 0, 0, 1, 0});
@@ -5297,9 +5066,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(2.0 / 6, val, 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testHammingDistance2(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new double[] {0, 0, 0, 1, 0, 0});
         INDArray y = Nd4j.create(new double[] {0, 1, 0, 0, 1, 0});
@@ -5309,9 +5077,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(3.0 / 6, val, 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testHammingDistance3(Nd4jBackend backend) {
         INDArray x = Nd4j.create(DataType.DOUBLE, 10, 6);
         for (int r = 0; r < x.rows(); r++) {
@@ -5333,9 +5100,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllDistances1(Nd4jBackend backend) {
         INDArray initialX = Nd4j.create(5, 10);
         INDArray initialY = Nd4j.create(7, 10);
@@ -5367,9 +5133,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllDistances2(Nd4jBackend backend) {
         INDArray initialX = Nd4j.create(5, 10);
         INDArray initialY = Nd4j.create(7, 10);
@@ -5399,9 +5164,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllDistances2_Large(Nd4jBackend backend) {
         INDArray initialX = Nd4j.create(5, 2000);
         INDArray initialY = Nd4j.create(7, 2000);
@@ -5431,9 +5195,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllDistances3_Large(Nd4jBackend backend) {
         INDArray initialX = Nd4j.create(5, 2000);
         INDArray initialY = Nd4j.create(7, 2000);
@@ -5465,9 +5228,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllDistances3_Large_Columns(Nd4jBackend backend) {
         INDArray initialX = Nd4j.create(2000, 5);
         INDArray initialY = Nd4j.create(2000, 7);
@@ -5497,9 +5259,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllDistances4_Large_Columns(Nd4jBackend backend) {
         INDArray initialX = Nd4j.create(2000, 5);
         INDArray initialY = Nd4j.create(2000, 7);
@@ -5529,9 +5290,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllDistances5_Large_Columns(Nd4jBackend backend) {
         INDArray initialX = Nd4j.create(2000, 5);
         INDArray initialY = Nd4j.create(2000, 7);
@@ -5561,9 +5321,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllDistances3_Small_Columns(Nd4jBackend backend) {
         INDArray initialX = Nd4j.create(200, 5);
         INDArray initialY = Nd4j.create(200, 7);
@@ -5592,9 +5351,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllDistances3(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(123);
 
@@ -5619,9 +5377,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStridedTransforms1(Nd4jBackend backend) {
         //output: Rank: 2,Offset: 0
         //Order: c Shape: [5,2],  stride: [2,1]
@@ -5649,9 +5406,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertArrayEquals(exp1, out1.data().asFloat(), 1e-4f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEntropy1(Nd4jBackend backend) {
         INDArray x = Nd4j.rand(1, 100);
 
@@ -5661,9 +5417,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, res, 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEntropy2(Nd4jBackend backend) {
         INDArray x = Nd4j.rand(10, 100);
 
@@ -5678,9 +5433,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEntropy3(Nd4jBackend backend) {
         INDArray x = Nd4j.rand(1, 100);
 
@@ -5690,9 +5444,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, res, 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEntropy4(Nd4jBackend backend) {
         INDArray x = Nd4j.rand(1, 100);
 
@@ -5715,9 +5468,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         return Math.log(MathUtils.entropy(array));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReverse1(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {9, 8, 7, 6, 5, 4, 3, 2, 1, 0});
         INDArray exp = Nd4j.create(new double[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
@@ -5727,9 +5479,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, rev);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReverse2(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0});
         INDArray exp = Nd4j.create(new double[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10});
@@ -5739,9 +5490,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, rev);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReverse3(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {9, 8, 7, 6, 5, 4, 3, 2, 1, 0});
         INDArray exp = Nd4j.create(new double[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
@@ -5751,9 +5501,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, rev);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReverse4(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0});
         INDArray exp = Nd4j.create(new double[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10});
@@ -5763,9 +5512,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, rev);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReverse5(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0});
         INDArray exp = Nd4j.create(new double[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10});
@@ -5777,9 +5525,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReverse6(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0});
         INDArray exp = Nd4j.create(new double[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10});
@@ -5790,9 +5537,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertTrue(rev == array);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNativeSortView1(Nd4jBackend backend) {
         INDArray matrix = Nd4j.create(10, 10);
         INDArray exp = Nd4j.linspace(0, 9, 10, DataType.DOUBLE);
@@ -5807,9 +5553,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, matrix.getColumn(0));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNativeSort1(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {9, 2, 1, 7, 6, 5, 4, 3, 8, 0});
         INDArray exp1 = Nd4j.create(new double[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
@@ -5824,9 +5569,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp2, res);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNativeSort2(Nd4jBackend backend) {
         INDArray array = Nd4j.rand(1, 10000);
 
@@ -5839,9 +5583,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, res);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNativeSort3(Nd4jBackend backend) {
         int length = isIntegrationTests() ? 1048576 : 16484;
         INDArray array = Nd4j.linspace(1, length, length, DataType.DOUBLE).reshape(1, -1);
@@ -5856,9 +5599,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, res);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLongShapeDescriptor(){
         Nd4j.setDefaultDataTypes(DataType.DOUBLE, DataType.DOUBLE);
         INDArray arr = Nd4j.create(new float[]{1,2,3});
@@ -5867,9 +5609,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertNotNull(lsd);     //Fails here on CUDA, OK on native/cpu
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReverseSmall_1(Nd4jBackend backend) {
         val array = Nd4j.linspace(1, 10, 10, DataType.INT);
         val exp = array.dup(array.ordering());
@@ -5883,9 +5624,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, array);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReverseSmall_2(Nd4jBackend backend) {
         val array = Nd4j.linspace(1, 10, 10, DataType.INT);
         val exp = array.dup(array.ordering());
@@ -5899,9 +5639,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, rereversed);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReverseSmall_3(Nd4jBackend backend) {
         val array = Nd4j.linspace(1, 11, 11, DataType.INT);
         val exp = array.dup(array.ordering());
@@ -5916,9 +5655,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, array);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReverseSmall_4(Nd4jBackend backend) {
         val array = Nd4j.linspace(1, 11, 11, DataType.INT);
         val exp = array.dup(array.ordering());
@@ -5932,9 +5670,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, rereversed);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReverse_1(Nd4jBackend backend) {
         val array = Nd4j.linspace(1, 2017152, 2017152, DataType.INT);
         val exp = array.dup(array.ordering());
@@ -5948,9 +5685,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, array);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReverse_2(Nd4jBackend backend) {
         val array = Nd4j.linspace(1, 2017152, 2017152, DataType.INT);
         val exp = array.dup(array.ordering());
@@ -5964,9 +5700,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, rereversed);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNativeSort3_1(Nd4jBackend backend) {
         INDArray array = Nd4j.linspace(1, 2017152, 2017152, DataType.DOUBLE).reshape(1, -1);
         INDArray exp = array.dup();
@@ -5980,9 +5715,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, res);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNativeSortAlongDimension1(Nd4jBackend backend) {
         INDArray array = Nd4j.create(1000, 1000);
         INDArray exp1 = Nd4j.linspace(1, 1000, 1000, DataType.DOUBLE);
@@ -6024,9 +5758,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         return true;
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void shuffleTest(Nd4jBackend backend) {
         for (int e = 0; e < 5; e++) {
             //log.info("---------------------");
@@ -6042,9 +5775,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNativeSortAlongDimension3(Nd4jBackend backend) {
         INDArray array = Nd4j.create(2000,  2000);
         INDArray exp1 = Nd4j.linspace(1, 2000, 2000, DataType.DOUBLE);
@@ -6078,9 +5810,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNativeSortAlongDimension2(Nd4jBackend backend) {
         INDArray array = Nd4j.create(100, 10);
         INDArray exp1 = Nd4j.create(new double[] {9, 8, 7, 6, 5, 4, 3, 2, 1, 0});
@@ -6097,9 +5828,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPercentile1(Nd4jBackend backend) {
         INDArray array = Nd4j.linspace(1, 10, 10, DataType.DOUBLE);
         Percentile percentile = new Percentile(50);
@@ -6108,9 +5838,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, array.percentileNumber(50));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPercentile2(Nd4jBackend backend) {
         INDArray array = Nd4j.linspace(1, 9, 9, DataType.DOUBLE);
         Percentile percentile = new Percentile(50);
@@ -6120,9 +5849,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPercentile3(Nd4jBackend backend) {
         INDArray array = Nd4j.linspace(1, 9, 9, DataType.DOUBLE);
         Percentile percentile = new Percentile(75);
@@ -6131,9 +5859,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, array.percentileNumber(75));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPercentile4(Nd4jBackend backend) {
         INDArray array = Nd4j.linspace(1, 10, 10, DataType.DOUBLE);
         Percentile percentile = new Percentile(75);
@@ -6142,18 +5869,16 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, array.percentileNumber(75));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPercentile5(Nd4jBackend backend) {
         val array = Nd4j.createFromArray(new int[]{1, 1982});
         val perc = array.percentileNumber(75);
         assertEquals(1982.f, perc.floatValue(), 1e-5f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTadPercentile1(Nd4jBackend backend) {
         INDArray array = Nd4j.linspace(1, 10, 10, DataType.DOUBLE);
         Transforms.reverse(array, false);
@@ -6170,9 +5895,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
             assertEquals(exp, res.getDouble(i), 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPutiRowVector(Nd4jBackend backend) {
         INDArray matrix = Nd4j.createUninitialized(10, 10);
         INDArray exp = Nd4j.create(10, 10).assign(1.0);
@@ -6183,9 +5907,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, matrix);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPutiColumnsVector(Nd4jBackend backend) {
         INDArray matrix = Nd4j.createUninitialized(5, 10);
         INDArray exp = Nd4j.create(5, 10).assign(1.0);
@@ -6198,9 +5921,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, matrix);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRsub1(Nd4jBackend backend) {
         INDArray arr = Nd4j.ones(5).assign(2.0);
         INDArray exp_0 = Nd4j.ones(5).assign(2.0);
@@ -6214,9 +5936,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp_1, res);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastMin(Nd4jBackend backend) {
         INDArray matrix = Nd4j.create(5, 5);
         for (int r = 0; r < matrix.rows(); r++) {
@@ -6232,9 +5953,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastMax(Nd4jBackend backend) {
         INDArray matrix = Nd4j.create(5, 5);
         for (int r = 0; r < matrix.rows(); r++) {
@@ -6250,9 +5970,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastAMax(Nd4jBackend backend) {
         INDArray matrix = Nd4j.create(5, 5);
         for (int r = 0; r < matrix.rows(); r++) {
@@ -6268,9 +5987,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastAMin(Nd4jBackend backend) {
         INDArray matrix = Nd4j.create(5, 5);
         for (int r = 0; r < matrix.rows(); r++) {
@@ -6311,9 +6029,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(3.407605, res, 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPow1(Nd4jBackend backend) {
         val argX = Nd4j.create(3).assign(2.0);
         val argY = Nd4j.create(new double[]{1.0, 2.0, 3.0});
@@ -6323,9 +6040,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, res);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRDiv1(Nd4jBackend backend) {
         val argX = Nd4j.create(3).assign(2.0);
         val argY = Nd4j.create(new double[]{1.0, 2.0, 3.0});
@@ -6335,9 +6051,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, res);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEqualOrder1(Nd4jBackend backend) {
         val array = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(2, 3);
         val arrayC = array.dup('c');
@@ -6348,9 +6063,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(arrayC, arrayF);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatchTransform(Nd4jBackend backend) {
         val array = Nd4j.create(new double[] {1, 1, 1, 0, 1, 1},'c');
         val result = Nd4j.createUninitialized(DataType.BOOL, array.shape());
@@ -6362,9 +6076,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test4DSumView(Nd4jBackend backend) {
         INDArray labels = Nd4j.linspace(1, 160, 160, DataType.DOUBLE).reshape(2, 5, 4, 4);
         //INDArray labels = Nd4j.linspace(1, 192, 192).reshape(new long[]{2, 6, 4, 4});
@@ -6390,9 +6103,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(sum1_dup, sum1 );
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatMul1(Nd4jBackend backend) {
         val x = 2;
         val A1 = 3;
@@ -6404,9 +6116,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         val b = Nd4j.linspace(1, x * B1 * B2, x * B1 * B2, DataType.DOUBLE).reshape(x, B1, B2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReduction_Z1(Nd4jBackend backend) {
         val arrayX = Nd4j.create(10, 10, 10);
 
@@ -6415,9 +6126,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         Nd4j.getExecutioner().commit();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReduction_Z2(Nd4jBackend backend) {
         val arrayX = Nd4j.create(10, 10);
 
@@ -6426,9 +6136,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         Nd4j.getExecutioner().commit();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReduction_Z3(Nd4jBackend backend) {
         val arrayX = Nd4j.create(200, 300);
 
@@ -6437,9 +6146,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         Nd4j.getExecutioner().commit();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSoftmaxZ1(Nd4jBackend backend) {
         val original = Nd4j.linspace(1, 100, 100, DataType.DOUBLE).reshape(10, 10);
         val reference = original.dup(original.ordering());
@@ -6453,9 +6161,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(expected, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRDiv(Nd4jBackend backend) {
         val x = Nd4j.create(new double[]{2,2,2});
         val y = Nd4j.create(new double[]{4,6,8});
@@ -6477,9 +6184,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIm2Col(Nd4jBackend backend) {
         int kY = 5;
         int kX = 5;
@@ -6520,9 +6226,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemmStrides(Nd4jBackend backend) {
         // 4x5 matrix from arange(20)
         final INDArray X = Nd4j.arange(20).reshape(4,5);
@@ -6554,9 +6259,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalar_1(Nd4jBackend backend) {
         val scalar = Nd4j.create(new float[]{2.0f}, new long[]{});
 
@@ -6570,9 +6274,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(2.0f, scalar.getFloat(0), 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalar_2(Nd4jBackend backend) {
         val scalar = Nd4j.scalar(2.0f);
         val scalar2 = Nd4j.scalar(2.0f);
@@ -6591,9 +6294,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertNotEquals(scalar, scalar3);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVector_1(Nd4jBackend backend) {
         val vector = Nd4j.createFromArray(new float[] {1, 2, 3, 4, 5});
         val vector2 = Nd4j.createFromArray(new float[] {1, 2, 3, 4, 5});
@@ -6610,9 +6312,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertNotEquals(vector, vector3);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVectorScalar_2(Nd4jBackend backend) {
         val vector = Nd4j.createFromArray(new float[]{1, 2, 3, 4, 5});
         val scalar = Nd4j.scalar(2.0f);
@@ -6623,9 +6324,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, vector);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReshapeScalar(Nd4jBackend backend) {
         val scalar = Nd4j.scalar(2.0f);
         val newShape = scalar.reshape(1, 1, 1, 1);
@@ -6635,9 +6335,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReshapeVector(Nd4jBackend backend) {
         val vector = Nd4j.createFromArray(new float[]{1, 2, 3, 4, 5, 6});
         val newShape = vector.reshape(3, 2);
@@ -6702,9 +6401,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
          b = tf.constant([], shape=[1, 0])
          c = tf.matmul(a, b)
      */
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatmul_Empty(Nd4jBackend backend) {
         val mA = Nd4j.create(0,1);
         val mB = Nd4j.create(1,0);
@@ -6719,9 +6417,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.create(0,0), mC);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatmul_Empty1(Nd4jBackend backend) {
         val mA = Nd4j.create(1,0, 4);
         val mB = Nd4j.create(1,4, 0);
@@ -6737,9 +6434,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.create(1,0,0), mC);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarSqueeze(Nd4jBackend backend) {
         val scalar = Nd4j.create(new float[]{2.0f}, new long[]{1, 1});
         val output = Nd4j.scalar(0.0f);
@@ -6757,9 +6453,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, output);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarVectorSqueeze(Nd4jBackend backend) {
         val scalar = Nd4j.create(new float[]{2.0f}, new long[]{1});
 
@@ -6780,9 +6475,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, output);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVectorSqueeze(Nd4jBackend backend) {
         val vector = Nd4j.create(new float[]{1, 2, 3, 4, 5, 6}, new long[]{1, 6});
         val output = Nd4j.createFromArray(new float[] {0, 0, 0, 0, 0, 0});
@@ -6801,9 +6495,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, output);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatrixReshape(Nd4jBackend backend) {
         val matrix = Nd4j.create(new float[]{1, 2, 3, 4, 5, 6, 7, 8, 9}, new long[] {3, 3});
         val exp = Nd4j.create(new float[]{1, 2, 3, 4, 5, 6, 7, 8, 9}, new long[] {9});
@@ -6815,9 +6508,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVectorScalarConcat(Nd4jBackend backend) {
         val vector = Nd4j.createFromArray(new float[] {1, 2});
         val scalar = Nd4j.scalar(3.0f);
@@ -6841,9 +6533,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarPrint_1(Nd4jBackend backend) {
         val scalar = Nd4j.scalar(3.0f);
 
@@ -6851,9 +6542,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testValueArrayOf_1(Nd4jBackend backend) {
         val vector = Nd4j.valueArrayOf(new long[] {5}, 2f, DataType.FLOAT);
         val exp = Nd4j.createFromArray(new float[]{2, 2, 2, 2, 2});
@@ -6863,9 +6553,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testValueArrayOf_2(Nd4jBackend backend) {
         val scalar = Nd4j.valueArrayOf(new long[] {}, 2f);
         val exp = Nd4j.scalar(2f);
@@ -6875,9 +6564,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArrayCreation(Nd4jBackend backend) {
         val vector = Nd4j.create(new float[]{1, 2, 3}, new long[] {3}, 'c');
         val exp = Nd4j.createFromArray(new float[]{1, 2, 3});
@@ -6886,9 +6574,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, vector);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testACosh(){
         //http://www.wolframalpha.com/input/?i=acosh(x)
 
@@ -6905,9 +6592,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCosh(){
         //http://www.wolframalpha.com/input/?i=cosh(x)
 
@@ -6924,9 +6610,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAtanh(){
         //http://www.wolframalpha.com/input/?i=atanh(x)
 
@@ -6944,9 +6629,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLastIndex(){
 
         INDArray in = Nd4j.create(new double[][]{
@@ -6974,9 +6658,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReduce3AlexBug(Nd4jBackend backend) {
         val arr = Nd4j.linspace(1,100,100, DataType.DOUBLE).reshape('f', 10, 10).dup('c');
         val arr2 = Nd4j.linspace(1,100,100, DataType.DOUBLE).reshape('c', 10, 10);
@@ -6986,9 +6669,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllDistancesEdgeCase1(Nd4jBackend backend) {
         val x = Nd4j.create(400, 20).assign(2.0);
         val y = Nd4j.ones(1, 20);
@@ -6999,9 +6681,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcat_1(Nd4jBackend backend) {
         for(char order : new char[]{'c', 'f'}) {
 
@@ -7015,9 +6696,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRdiv()    {
         final INDArray a = Nd4j.create(new double[]{2.0, 2.0, 2.0, 2.0});
         final INDArray b = Nd4j.create(new double[]{1.0, 2.0, 4.0, 8.0});
@@ -7036,9 +6716,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(expected, b.rdivColumnVector(Nd4j.scalar(2)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRsub()    {
         final INDArray a = Nd4j.create(new double[]{2.0, 2.0, 2.0, 2.0});
         final INDArray b = Nd4j.create(new double[]{1.0, 2.0, 4.0, 8.0});
@@ -7058,9 +6737,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testHalfStuff(Nd4jBackend backend) {
         if (!Nd4j.getExecutioner().getClass().getSimpleName().toLowerCase().contains("cuda"))
             return;
@@ -7079,9 +6757,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInconsistentOutput(){
         INDArray in = Nd4j.rand(1, 802816);
         INDArray W = Nd4j.rand(802816, 1);
@@ -7094,9 +6771,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test3D_create_1(Nd4jBackend backend) {
         val jArray = new float[2][3][4];
 
@@ -7115,9 +6791,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test4D_create_1(Nd4jBackend backend) {
         val jArray = new float[2][3][4][5];
 
@@ -7135,9 +6810,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
             assertTrue(f > 0.0f,"Failed for element [" + cnt++ +"]");
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcast_1(Nd4jBackend backend) {
         val array1 = Nd4j.linspace(1, 10, 10, DataType.DOUBLE).reshape(5, 1, 2).broadcast(5, 4, 2);
         val array2 = Nd4j.linspace(1, 20, 20, DataType.DOUBLE).reshape(5, 4, 1).broadcast(5, 4, 2);
@@ -7149,9 +6823,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAddiColumnEdge(){
         INDArray arr1 = Nd4j.create(1, 5);
         arr1.addiColumnVector(Nd4j.ones(1));
@@ -7159,9 +6832,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmulViews_1(Nd4jBackend backend) {
         val arrayX = Nd4j.linspace(1, 27, 27, DataType.DOUBLE).reshape(3, 3, 3);
 
@@ -7180,9 +6852,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, arrayb.mmul(arrayb));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTile_1(Nd4jBackend backend) {
         val array = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(2, 3);
         val exp = Nd4j.create(new double[] {1.000000, 2.000000, 3.000000, 1.000000, 2.000000, 3.000000, 4.000000, 5.000000, 6.000000, 4.000000, 5.000000, 6.000000, 1.000000, 2.000000, 3.000000, 1.000000, 2.000000, 3.000000, 4.000000, 5.000000, 6.000000, 4.000000, 5.000000, 6.000000}, new int[] {4, 6});
@@ -7199,9 +6870,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, output);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRelativeError_1(Nd4jBackend backend) {
         val arrayX = Nd4j.create(10, 10);
         val arrayY = Nd4j.ones(10, 10);
@@ -7212,16 +6882,14 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, arrayX);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBugMeshgridOnDoubleArray(Nd4jBackend backend) {
         Nd4j.meshgrid(Nd4j.create(new double[] { 1, 2, 3 }), Nd4j.create(new double[] { 4, 5, 6 }));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMeshGrid(){
 
         INDArray x1 = Nd4j.create(new double[]{1,2,3,4}).reshape(1, -1);
@@ -7259,9 +6927,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertArrayEquals(exp, out5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAccumuationWithoutAxis_1(Nd4jBackend backend) {
         val array = Nd4j.create(3, 3).assign(1.0);
 
@@ -7271,9 +6938,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(9.0, result.getDouble(0), 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSummaryStatsEquality_1(Nd4jBackend backend) {
 //        log.info("Datatype: {}", Nd4j.dataType());
 
@@ -7292,9 +6958,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMeanEdgeCase_C(){
         INDArray arr = Nd4j.linspace(1, 30,30, DataType.DOUBLE).reshape(new int[]{3,10,1}).dup('c');
         INDArray arr2 = arr.mean(2);
@@ -7304,9 +6969,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, arr2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMeanEdgeCase_F(){
         INDArray arr = Nd4j.linspace(1, 30,30, DataType.DOUBLE).reshape(new int[]{3,10,1}).dup('f');
         INDArray arr2 = arr.mean(2);
@@ -7316,9 +6980,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, arr2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMeanEdgeCase2_C(){
         INDArray arr = Nd4j.linspace(1, 60,60, DataType.DOUBLE).reshape(new int[]{3,10,2}).dup('c');
         INDArray arr2 = arr.mean(2);
@@ -7331,9 +6994,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, arr2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMeanEdgeCase2_F(){
         INDArray arr = Nd4j.linspace(1, 60,60, DataType.DOUBLE).reshape(new int[]{3,10,2}).dup('f');
         INDArray arr2 = arr.mean(2);
@@ -7346,9 +7008,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, arr2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLegacyDeserialization_1() throws Exception {
         val f = new ClassPathResource("legacy/NDArray_javacpp.bin").getFile();
 
@@ -7368,9 +7029,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, array2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRndBloat16(Nd4jBackend backend) {
         INDArray x  = Nd4j.rand(DataType.BFLOAT16 , 'c', new long[]{5});
         assertTrue(x.sumNumber().floatValue() > 0);
@@ -7379,9 +7039,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertTrue(x.sumNumber().floatValue() != 0.0);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLegacyDeserialization_2() throws Exception {
         val f = new ClassPathResource("legacy/NDArray_longshape_float.bin").getFile();
 
@@ -7402,9 +7061,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, array2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLegacyDeserialization_3() throws Exception {
         val f = new ClassPathResource("legacy/NDArray_longshape_double.bin").getFile();
 
@@ -7424,9 +7082,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, array2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTearPile_1(Nd4jBackend backend) {
         val source = Nd4j.rand(new int[]{10, 15});
 
@@ -7441,9 +7098,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(source, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVariance_4D_1(Nd4jBackend backend) {
         val dtype = Nd4j.dataType();
 
@@ -7459,9 +7115,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         Nd4j.setDataType(dtype);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTranspose_Custom(){
 
         INDArray arr = Nd4j.linspace(1,15, 15, DataType.DOUBLE).reshape(5,3);
@@ -7478,9 +7133,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRowColumnOpsRank1(){
 
         for( int i=0; i<6; i++ ) {
@@ -7543,9 +7197,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyShapeRank0(){
         Nd4j.getRandom().setSeed(12345);
         int[] s = new int[0];
@@ -7581,9 +7234,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(tsRand, rand);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarView_1(Nd4jBackend backend) {
         val array = Nd4j.linspace(1, 5, 5, DataType.DOUBLE);
         val exp = Nd4j.create(new double[]{1.0, 2.0, 5.0, 4.0, 5.0});
@@ -7595,9 +7247,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, array);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarView_2(Nd4jBackend backend) {
         val array = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         val exp = Nd4j.create(new double[]{1.0, 2.0, 5.0, 4.0}).reshape(2, 2);
@@ -7609,9 +7260,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, array);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSomething_1(Nd4jBackend backend) {
         val arrayX = Nd4j.create(128, 128, 'f');
         val arrayY = Nd4j.create(128, 128, 'f');
@@ -7638,9 +7288,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIndexesIteration_1(Nd4jBackend backend) {
         val arrayC = Nd4j.linspace(1,  60,  60, DataType.DOUBLE).reshape(3, 4, 5);
         val arrayF = arrayC.dup('f');
@@ -7657,9 +7306,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIndexesIteration_2(Nd4jBackend backend) {
         val arrayC = Nd4j.linspace(1,  60,  60, DataType.DOUBLE).reshape(3, 4, 5);
         val arrayF = arrayC.dup('f');
@@ -7683,9 +7331,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPairwiseScalar_1(Nd4jBackend backend) {
         val exp_1 = Nd4j.create(new double[]{2.0, 3.0, 4.0}, new long[]{3});
         val exp_2 = Nd4j.create(new double[]{0.0, 1.0, 2.0}, new long[]{3});
@@ -7706,9 +7353,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp_3, arrayZ_4);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLTOE_1(Nd4jBackend backend) {
         val x = Nd4j.create(new double[]{1.0, 2.0, 3.0, -1.0});
         val y = Nd4j.create(new double[]{2.0, 2.0, 3.0, -2.0});
@@ -7725,9 +7371,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(ez, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGTOE_1(Nd4jBackend backend) {
         val x = Nd4j.create(new double[]{1.0, 2.0, 3.0, -1.0});
         val y = Nd4j.create(new double[]{2.0, 2.0, 3.0, -2.0});
@@ -7760,9 +7405,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGet(){
         //https://github.com/deeplearning4j/deeplearning4j/issues/6133
         INDArray m = Nd4j.linspace(0,99,100, DataType.DOUBLE).reshape('c', 10,10);
@@ -7786,9 +7430,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertArrayEquals(exp.toDoubleVector(), col.toDoubleVector(), 1e-6);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWhere1(){
 
         INDArray arr = Nd4j.create(new boolean[][]{{false,true,false},{false,false,true},{false,false,true}});
@@ -7801,9 +7444,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertArrayEquals(exp, act);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWhere2(){
 
         INDArray arr = Nd4j.create(DataType.BOOL, 3,3,3);
@@ -7821,9 +7463,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertArrayEquals(exp, act);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWhere3(){
         INDArray arr = Nd4j.create(new boolean[][]{{false,true,false},{false,false,true},{false,false,true}});
         INDArray x = Nd4j.valueArrayOf(3, 3, 1.0);
@@ -7839,9 +7480,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, act[0]);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWhereEmpty(){
         INDArray inArray = Nd4j.zeros(2, 3);
         inArray.putScalar(0, 0, 10.0f);
@@ -7866,9 +7506,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarEquality_1(Nd4jBackend backend) {
         val x = Nd4j.scalar(1.0f);
         val e = Nd4j.scalar(3.0f);
@@ -7878,9 +7517,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(e, x);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStack(){
         INDArray in = Nd4j.linspace(1,12,12, DataType.DOUBLE).reshape(3,4);
         INDArray in2 = in.add(100);
@@ -7908,9 +7546,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPutSpecifiedIndex(){
         long[][] ss = new long[][]{{3,4}, {3,4,5}, {3,4,5,6}};
         long[][] st = new long[][]{{4,4}, {4,4,5}, {4,4,5,6}};
@@ -7941,9 +7578,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPutSpecifiedIndices2d(){
 
         INDArray arr = Nd4j.create(3,4);
@@ -7961,9 +7597,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, arr);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPutSpecifiedIndices3d(){
 
         INDArray arr = Nd4j.create(2,3,4);
@@ -7983,9 +7618,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, arr);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSpecifiedIndexArraySize1(Nd4jBackend backend) {
         long[] shape = {2, 2, 2, 2};
         INDArray in = Nd4j.create(shape);
@@ -7996,9 +7630,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertArrayEquals(expShape, arr.shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTransposei(){
         INDArray arr = Nd4j.linspace(1,12,12).reshape('c',3,4);
 
@@ -8009,9 +7642,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertTrue(arr == ti);  //Should be same object
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScatterUpdateShortcut(Nd4jBackend backend) {
         val array = Nd4j.create(DataType.FLOAT, 5, 2);
         val updates = Nd4j.createFromArray(new float[][] {{1,1}, {2,2}, {3, 3}});
@@ -8040,9 +7672,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStatistics_1(Nd4jBackend backend) {
         val array = Nd4j.createFromArray(new float[] {-1.0f, 0.0f, 1.0f});
         val stats = Nd4j.getExecutioner().inspectArray(array);
@@ -8053,9 +7684,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(0.0f, stats.getMeanValue(), 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testINDArrayMmulWithTranspose(){
         Nd4j.getRandom().setSeed(12345);
         INDArray a = Nd4j.rand(2,5);
@@ -8094,9 +7724,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, act);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInvalidOrder(){
 
         try {
@@ -8149,9 +7778,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAssignValid(){
         INDArray arr1 = Nd4j.linspace(1, 12, 12).reshape('c', 3, 4);
         INDArray arr2 = Nd4j.create(3,4);
@@ -8159,9 +7787,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(arr1, arr2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAssignInvalid(){
         INDArray arr1 = Nd4j.linspace(1, 12, 12).reshape('c', 3, 4);
         INDArray arr2 = Nd4j.create(4,3);
@@ -8173,9 +7800,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyCasting(){
         for(val from : DataType.values()) {
             if (from == DataType.UTF8 || from == DataType.UNKNOWN || from == DataType.COMPRESSED)
@@ -8201,9 +7827,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVStackRank1(){
         List<INDArray> list = new ArrayList<>();
         list.add(Nd4j.linspace(1,3,3, DataType.DOUBLE));
@@ -8218,9 +7843,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAxpyOpRows(){
         INDArray arr = Nd4j.create(1,4).assign(2.0f);
         INDArray ones = Nd4j.ones(1,4).assign(3.0f);
@@ -8232,17 +7856,15 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, arr);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyArray(Nd4jBackend backend) {
         INDArray empty = Nd4j.empty(DataType.INT);
         assertEquals(empty.toString(), "[]");
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLinspaceWithStep(){
 
         double lower = -0.9, upper = 0.9, step = 0.2;
@@ -8272,9 +7894,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLinspaceWithStepForIntegers(){
 
         long lower = -9, upper = 9, step = 2;
@@ -8304,9 +7925,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArangeWithStep(Nd4jBackend backend) {
         int begin = -9, end = 9, step = 2;
         INDArray in = Nd4j.arange(begin, end, step);
@@ -8321,9 +7941,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(in.getInt(8), 7);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRollingMean(Nd4jBackend backend) {
         val wsconf = WorkspaceConfiguration.builder()
                 .initialSize(4L * (32*128*256*256 + 32*128 + 10*1024*1024))
@@ -8357,16 +7976,14 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testZerosRank1(Nd4jBackend backend) {
         Nd4j.zeros(new int[] { 2 }, DataType.DOUBLE);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReshapeEnforce(){
 
         INDArray arr = Nd4j.create(new long[]{2,2}, 'c');
@@ -8385,9 +8002,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRepeatSimple(){
 
         INDArray arr = Nd4j.createFromArray(new double[][]{
@@ -8410,9 +8026,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp1, r1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRowsEdgeCaseView(){
 
         INDArray arr = Nd4j.linspace(0, 9, 10, DataType.DOUBLE).reshape('f', 5, 2).dup('c');    //0,1,2... along columns
@@ -8435,9 +8050,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRepeatStrided(Nd4jBackend backend) {
 
         // Create a 2D array (shape 5x5)
@@ -8456,9 +8070,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(repeatedSlice, repeatedDup);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMeshgridDtypes(Nd4jBackend backend) {
         Nd4j.setDefaultDataTypes(DataType.FLOAT, DataType.FLOAT);
         Nd4j.meshgrid(Nd4j.create(new double[] { 1, 2, 3 }), Nd4j.create(new double[] { 4, 5, 6 }));
@@ -8466,9 +8079,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         Nd4j.meshgrid(Nd4j.createFromArray(1, 2, 3), Nd4j.createFromArray(4, 5, 6));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetColumnRowVector(){
         INDArray arr = Nd4j.create(1,4);
         INDArray col = arr.getColumn(0);
@@ -8477,9 +8089,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyArrayReuse(){
         //Empty arrays are immutable - no point creating them multiple times
         INDArray ef1 = Nd4j.empty(DataType.FLOAT);
@@ -8491,9 +8102,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertTrue(el1 == el2);       //Should be exact same object
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMaxViewF(){
         INDArray arr = Nd4j.create(DataType.DOUBLE, new long[]{8,2}, 'f').assign(999);
 
@@ -8504,9 +8114,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.create(new double[]{2,4}), view.max(1));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMin2(){
         INDArray x = Nd4j.createFromArray(new double[][]{
                 {-999,       0.2236,    0.7973,    0.0962},
@@ -8557,9 +8166,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCreateF(){
         char origOrder = Nd4j.order();
         try {
@@ -8592,9 +8200,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReduceKeepDimsShape(){
         INDArray arr = Nd4j.create(3,4);
         INDArray out = arr.sum(true, 1);
@@ -8604,9 +8211,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{1, 4}, out2.shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSliceRow(){
         double[] data = new double[]{15.0, 16.0};
         INDArray vector = Nd4j.createFromArray(data).reshape(1,2);
@@ -8617,9 +8223,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.createFromArray(-1.0, -1.0).reshape(1,2), vector);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSliceMatrix(){
         INDArray arr = Nd4j.arange(4).reshape(2,2);
 //        System.out.println(arr.slice(0));
@@ -8629,9 +8234,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         arr.slice(1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarEq(){
         INDArray scalarRank2 = Nd4j.scalar(10.0).reshape(1,1);
         INDArray scalarRank1 = Nd4j.scalar(10.0).reshape(1);
@@ -8646,9 +8250,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
     //@Disabled // https://github.com/eclipse/deeplearning4j/issues/7632
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetWhereINDArray(Nd4jBackend backend) {
         INDArray input = Nd4j.create(new double[] { 1, -3, 4, 8, -2, 5 });
         INDArray comp = Nd4j.create(new double[]{2, -3, 1, 1, -2, 1 });
@@ -8658,9 +8261,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(expected, actual);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetWhereNumber(Nd4jBackend backend) {
         INDArray input = Nd4j.create(new double[] { 1, -3, 4, 8, -2, 5 });
         INDArray expected = Nd4j.create(new double[] { 8, 5 });
@@ -8669,9 +8271,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(expected, actual);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testType1(@TempDir Path testDir) throws IOException {
         for (int i = 0; i < 10; ++i) {
             INDArray in1 = Nd4j.rand(DataType.DOUBLE, new int[]{100, 100});
@@ -8692,9 +8293,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOnes(){
         INDArray arr = Nd4j.ones();
         INDArray arr2 = Nd4j.ones(DataType.LONG);
@@ -8704,9 +8304,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(1, arr2.length());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testZeros(){
         INDArray arr = Nd4j.zeros();
         INDArray arr2 = Nd4j.zeros(DataType.LONG);
@@ -8716,9 +8315,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(1, arr2.length());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testType2(@TempDir Path testDir) throws IOException {
         for (int i = 0; i < 10; ++i) {
             INDArray in1 = Nd4j.ones(DataType.UINT16);
@@ -8773,9 +8371,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToXMatrix(){
 
         List<long[]> shapes = Arrays.asList(new long[]{3, 4}, new long[]{3, 1}, new long[]{1,3});
@@ -8804,9 +8401,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToXVector(){
 
         List<long[]> shapes = Arrays.asList(new long[]{3}, new long[]{3, 1}, new long[]{1,3});
@@ -8836,9 +8432,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSumEdgeCase(){
         INDArray row = Nd4j.create(1,3);
         INDArray sum = row.sum(0);
@@ -8849,9 +8444,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{3}, sum2.shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMedianEdgeCase(){
         INDArray rowVec = Nd4j.rand(DataType.FLOAT, 1, 10);
         INDArray median = rowVec.median(0);
@@ -8870,9 +8464,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         colVec.median();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void mmulToScalar(Nd4jBackend backend) {
         final INDArray arr1 = Nd4j.create(new float[] {1,2,3}).reshape(1,3);
         final INDArray arr2 = arr1.reshape(3,1);
@@ -8880,9 +8473,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCreateDtypes(Nd4jBackend backend) {
         int[] sliceShape = new int[] {9};
         float[] arrays = new float[] {1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f};
@@ -8896,9 +8488,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCreateShapeValidation(){
         try {
             Nd4j.create(new double[]{1, 2, 3}, new int[]{1, 1});
@@ -8949,9 +8540,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
                         arr[i][j][k][m] = (float) cnt++;
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBatchToSpace(){
 
         INDArray out = Nd4j.create(DataType.FLOAT, 2, 4, 5);
@@ -8972,9 +8562,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         //from [4,4,3] to [2,4,6] then crop to [2,4,5]
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToFromByteArray() throws IOException {
         // simple test to get rid of toByteArray and fromByteArray compiler warnings.
         INDArray x = Nd4j.arange(10);
@@ -8991,9 +8580,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVStackHStack1d(Nd4jBackend backend) {
         INDArray rowVector1 = Nd4j.create(new double[]{1,2,3});
         INDArray rowVector2 = Nd4j.create(new double[]{4,5,6});
@@ -9006,9 +8594,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReduceAll_1(Nd4jBackend backend) {
         val x = Nd4j.empty(DataType.FLOAT);
         val e = Nd4j.scalar(true);
@@ -9017,9 +8604,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(e, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReduceAll_2(Nd4jBackend backend) {
         val x = Nd4j.ones(DataType.FLOAT, 0);
         val e = Nd4j.scalar(true);
@@ -9028,9 +8614,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(e, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReduceAll_3(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.FLOAT, 0);
         assertEquals(1, x.rank());
@@ -9041,18 +8626,16 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(e, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarEqualsNoResult(){
         INDArray out = Nd4j.exec(new ScalarEquals(Nd4j.createFromArray(-2, -1, 0, 1, 2), null, 0));
         INDArray exp = Nd4j.createFromArray(false, false, true, false, false);
         assertEquals(exp, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPutOverwrite(){
         INDArray arr = Nd4j.create(DataType.DOUBLE, 10);
         arr.putScalar(0, 10);
@@ -9063,9 +8646,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         System.out.println(arr);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyReshapingMinus1(){
         INDArray arr0 = Nd4j.create(DataType.FLOAT, 2, 0);
         INDArray arr1 = Nd4j.create(DataType.FLOAT, 0, 1, 2);
@@ -9079,9 +8661,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{10, 0}, out2.shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConv2DWeightsFormat1(Nd4jBackend backend) {
         int bS = 2, iH = 4, iW = 3, iC = 4, oC = 3, kH = 3, kW = 2, sH = 1, sW = 1, pH = 0, pW = 0, dH = 1, dW = 1;
         int       oH=2,oW=2;
@@ -9113,9 +8694,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{bS, oC, oH, oW}, ret[0].shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConv2DWeightsFormat2(Nd4jBackend backend) {
         int bS=2, iH=4,iW=3,  iC=4,oC=3,  kH=3,kW=2,  sH=1,sW=1,  pH=0,pW=0,  dH=1,dW=1;
         int oH=4,oW=3;
@@ -9145,9 +8725,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{bS, oH, oW, oC}, ret[0].shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatmulMethod_8(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.INT8, 3, 5).assign(1);
         val y = Nd4j.create(DataType.INT8, 5, 3).assign(1);
@@ -9157,9 +8736,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(e, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatmulMethod_7(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.INT16, 3, 5).assign(1);
         val y = Nd4j.create(DataType.INT16, 5, 3).assign(1);
@@ -9169,9 +8747,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(e, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatmulMethod_1(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.INT32, 3, 5).assign(1);
         val y = Nd4j.create(DataType.INT32, 5, 3).assign(1);
@@ -9181,9 +8758,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(e, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatmulMethod_2(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.INT64, 3, 5).assign(1);
         val y = Nd4j.create(DataType.INT64, 5, 3).assign(1);
@@ -9193,9 +8769,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(e, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatmulMethod_6(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.UINT8, 3, 5).assign(1);
         val y = Nd4j.create(DataType.UINT8, 5, 3).assign(1);
@@ -9205,9 +8780,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(e, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatmulMethod_5(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.UINT16, 3, 5).assign(1);
         val y = Nd4j.create(DataType.UINT16, 5, 3).assign(1);
@@ -9217,9 +8791,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(e, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatmulMethod_3(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.UINT32, 3, 5).assign(1);
         val y = Nd4j.create(DataType.UINT32, 5, 3).assign(1);
@@ -9229,9 +8802,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(e, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatmulMethod_4(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.UINT64, 3, 5).assign(1);
         val y = Nd4j.create(DataType.UINT64, 5, 3).assign(1);
@@ -9241,9 +8813,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         assertEquals(e, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCreateBufferFromByteBuffer(){
 
         for(DataType dt : DataType.values()){
@@ -9270,9 +8841,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCreateBufferFromByteBufferViews(){
 
         for(DataType dt : DataType.values()){
@@ -9297,9 +8867,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTypeCastingToString(){
 
         for(DataType dt : DataType.values()) {
@@ -9317,9 +8886,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testShape0Casts(){
         for(DataType dt : DataType.values()){
             if(!dt.isNumerical())
@@ -9338,9 +8906,8 @@ public class Nd4jTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSmallSort(){
         INDArray arr = Nd4j.createFromArray(0.5, 0.4, 0.1, 0.2);
         INDArray expected = Nd4j.createFromArray(0.1, 0.2, 0.4, 0.5);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsComparisonC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsComparisonC.java
index f6ebb4b57..febc4aaa5 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsComparisonC.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsComparisonC.java
@@ -69,9 +69,8 @@ public class Nd4jTestsComparisonC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemmWithOpsCommonsMath(Nd4jBackend backend) {
         List<Pair<INDArray, String>> first = NDArrayCreationUtil.getAllTestMatricesWithShape(3, 5, SEED, DataType.DOUBLE);
         List<Pair<INDArray, String>> firstT = NDArrayCreationUtil.getAllTestMatricesWithShape(5, 3, SEED, DataType.DOUBLE);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsComparisonFortran.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsComparisonFortran.java
index 0be72945b..e0aaa1cb3 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsComparisonFortran.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsComparisonFortran.java
@@ -71,9 +71,8 @@ public class Nd4jTestsComparisonFortran extends BaseNd4jTestWithBackends {
         return 'f';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCrash(Nd4jBackend backend) {
         INDArray array3d = Nd4j.ones(1, 10, 10);
         Nd4j.getExecutioner().getTADManager().getTADOnlyShapeInfo(array3d, 0);
@@ -83,9 +82,8 @@ public class Nd4jTestsComparisonFortran extends BaseNd4jTestWithBackends {
         Nd4j.getExecutioner().getTADManager().getTADOnlyShapeInfo(array4d, 0);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmulWithOpsCommonsMath(Nd4jBackend backend) {
         List<Pair<INDArray, String>> first = NDArrayCreationUtil.getAllTestMatricesWithShape(3, 5, SEED, DataType.DOUBLE);
         List<Pair<INDArray, String>> second = NDArrayCreationUtil.getAllTestMatricesWithShape(5, 4, SEED, DataType.DOUBLE);
@@ -100,9 +98,8 @@ public class Nd4jTestsComparisonFortran extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemmWithOpsCommonsMath(Nd4jBackend backend) {
         List<Pair<INDArray, String>> first = NDArrayCreationUtil.getAllTestMatricesWithShape(3, 5, SEED, DataType.DOUBLE);
         List<Pair<INDArray, String>> firstT = NDArrayCreationUtil.getAllTestMatricesWithShape(5, 3, SEED, DataType.DOUBLE);
@@ -158,9 +155,8 @@ public class Nd4jTestsComparisonFortran extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemvApacheCommons(Nd4jBackend backend) {
 
         int[] rowsArr = new int[] {4, 4, 4, 8, 8, 8};
@@ -215,9 +211,8 @@ public class Nd4jTestsComparisonFortran extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAddSubtractWithOpsCommonsMath(Nd4jBackend backend) {
         List<Pair<INDArray, String>> first = NDArrayCreationUtil.getAllTestMatricesWithShape(3, 5, SEED, DataType.DOUBLE);
         List<Pair<INDArray, String>> second = NDArrayCreationUtil.getAllTestMatricesWithShape(3, 5, SEED, DataType.DOUBLE);
@@ -235,9 +230,8 @@ public class Nd4jTestsComparisonFortran extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMulDivOnCheckUtilMatrices(Nd4jBackend backend) {
         List<Pair<INDArray, String>> first = NDArrayCreationUtil.getAllTestMatricesWithShape(3, 5, SEED, DataType.DOUBLE);
         List<Pair<INDArray, String>> second = NDArrayCreationUtil.getAllTestMatricesWithShape(3, 5, SEED, DataType.DOUBLE);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsF.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsF.java
index 8837e89a2..a1f4b4e11 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsF.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsF.java
@@ -42,9 +42,8 @@ public class Nd4jTestsF extends BaseNd4jTestWithBackends {
 
     DataType initialType = Nd4j.dataType();
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcat3D_Vstack_F(Nd4jBackend backend) {
         //Nd4j.getExecutioner().enableVerboseMode(true);
         //Nd4j.getExecutioner().enableDebugMode(true);
@@ -76,9 +75,8 @@ public class Nd4jTestsF extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSlice_1(Nd4jBackend backend) {
         val arr = Nd4j.linspace(1,4, 4, DataType.DOUBLE).reshape(2, 2, 1);
         val exp0 = Nd4j.create(new double[]{1, 3}, new int[] {2, 1});
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ShufflesTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ShufflesTests.java
index 5e7813b8d..31a56c048 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ShufflesTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ShufflesTests.java
@@ -32,15 +32,14 @@ import org.nd4j.common.util.ArrayUtil;
 
 import java.util.*;
 
-import static junit.framework.TestCase.assertTrue;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 
 public class ShufflesTests extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSimpleShuffle1(Nd4jBackend backend) {
         INDArray array = Nd4j.zeros(10, 10);
         for (int x = 0; x < 10; x++) {
@@ -62,9 +61,8 @@ public class ShufflesTests extends BaseNd4jTestWithBackends {
         assertTrue(scanner.compareRow(array));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSimpleShuffle2(Nd4jBackend backend) {
         INDArray array = Nd4j.zeros(10, 10);
         for (int x = 0; x < 10; x++) {
@@ -79,9 +77,8 @@ public class ShufflesTests extends BaseNd4jTestWithBackends {
         assertTrue(scanner.compareColumn(array));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSimpleShuffle3(Nd4jBackend backend) {
         INDArray array = Nd4j.zeros(11, 10);
         for (int x = 0; x < 11; x++) {
@@ -97,9 +94,8 @@ public class ShufflesTests extends BaseNd4jTestWithBackends {
         assertTrue(scanner.compareRow(array));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSymmetricShuffle1(Nd4jBackend backend) {
         INDArray features = Nd4j.zeros(10, 10);
         INDArray labels = Nd4j.zeros(10, 3);
@@ -137,9 +133,8 @@ public class ShufflesTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSymmetricShuffle2(Nd4jBackend backend) {
         INDArray features = Nd4j.zeros(10, 10, 20);
         INDArray labels = Nd4j.zeros(10, 10, 3);
@@ -177,9 +172,8 @@ public class ShufflesTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSymmetricShuffle3(Nd4jBackend backend) {
         INDArray features = Nd4j.zeros(10, 10, 20);
         INDArray featuresMask = Nd4j.zeros(10, 20);
@@ -244,9 +238,8 @@ public class ShufflesTests extends BaseNd4jTestWithBackends {
      * There's SMALL chance this test will randomly fail, since spread isn't too big
      * @throws Exception
      */
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testHalfVectors1(Nd4jBackend backend) {
         int[] array1 = ArrayUtil.buildHalfVector(new Random(12), 20);
         int[] array2 = ArrayUtil.buildHalfVector(new Random(75), 20);
@@ -267,9 +260,8 @@ public class ShufflesTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInterleavedVector1(Nd4jBackend backend) {
         int[] array1 = ArrayUtil.buildInterleavedVector(new Random(12), 20);
         int[] array2 = ArrayUtil.buildInterleavedVector(new Random(75), 20);
@@ -290,9 +282,8 @@ public class ShufflesTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInterleavedVector3(Nd4jBackend backend) {
         for (int e = 0; e < 1000; e++) {
             int length = e + 256; //RandomUtils.nextInt(121, 2073);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/TestEigen.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/TestEigen.java
index f1b1a6b36..715036c72 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/TestEigen.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/TestEigen.java
@@ -54,9 +54,8 @@ public class TestEigen extends BaseNd4jTestWithBackends {
 
     // test of functions added by Luke Czapla
     // Compares solution of A x = L x  to solution to A x = L B x when it is simple
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test2Syev(Nd4jBackend backend) {
         for(DataType dt : new DataType[]{DataType.DOUBLE, DataType.FLOAT, DataType.HALF}) {
             Nd4j.setDefaultDataTypes(dt, dt);
@@ -75,9 +74,8 @@ public class TestEigen extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSyev(Nd4jBackend backend) {
         for(DataType dt : new DataType[]{DataType.DOUBLE, DataType.FLOAT, DataType.HALF}) {
             //log.info("Datatype: {}", dt);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ToStringTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ToStringTest.java
index 747ea39ab..b44170433 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ToStringTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ToStringTest.java
@@ -37,9 +37,8 @@ import org.nd4j.common.util.ArrayUtil;
 @Slf4j
 public class ToStringTest extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToString(Nd4jBackend backend) throws Exception {
         assertEquals("[         1,         2,         3]",
                 Nd4j.createFromArray(1, 2, 3).toString());
@@ -57,9 +56,8 @@ public class ToStringTest extends BaseNd4jTestWithBackends {
                 Nd4j.createFromArray(1, 2, 3, 4, 5, 6, 7, 8).toString(6, true, 1));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToStringScalars(){
         DataType[] dataTypes = new DataType[]{DataType.FLOAT, DataType.DOUBLE, DataType.BOOL, DataType.INT, DataType.UINT32};
         String[] strs = new String[]{"1.0000", "1.0000", "true", "1", "1"};
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/activations/TestActivation.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/activations/TestActivation.java
index 4b0455305..372fdea2b 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/activations/TestActivation.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/activations/TestActivation.java
@@ -53,8 +53,9 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
-import static junit.framework.TestCase.assertTrue;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
 public class TestActivation extends BaseNd4jTestWithBackends {
@@ -76,9 +77,8 @@ public class TestActivation extends BaseNd4jTestWithBackends {
         mapper.enable(SerializationFeature.INDENT_OUTPUT);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRelu(Nd4jBackend backend){
 
         Double[] max = {null, 6.0, 2.5, 5.0};
@@ -130,9 +130,8 @@ public class TestActivation extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testJson(Nd4jBackend backend) throws Exception {
 
         IActivation[] activations = new IActivation[] {new ActivationCube(), new ActivationELU(0.25),
@@ -179,7 +178,7 @@ public class TestActivation extends BaseNd4jTestWithBackends {
 
             for (String s : expFields) {
                 msg = "Expected field \"" + s + "\", was not found in " + activations[i].toString();
-                assertTrue(msg, actualFieldsByName.contains(s));
+                assertTrue(actualFieldsByName.contains(s),msg);
             }
 
             //Test conversion from JSON:
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestBackend.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestBackend.java
index 64e5d4924..273499c8c 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestBackend.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestBackend.java
@@ -30,9 +30,8 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 public class TestBackend extends BaseNd4jTestWithBackends {
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBuildInfo(Nd4jBackend backend){
         System.out.println("Backend build info: " +  backend.buildInfo());
     }
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestEnvironment.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestEnvironment.java
index 1eb61c4f1..4dd36aedb 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestEnvironment.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestEnvironment.java
@@ -37,9 +37,8 @@ public class TestEnvironment extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEnvironment(Nd4jBackend backend){
         Environment e = Nd4j.getEnvironment();
         System.out.println("BLAS version: " + e.blasMajorVersion() + "." + e.blasMinorVersion() + "." + e.blasPatchVersion());
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestNDArrayCreation.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestNDArrayCreation.java
index 4eb25d221..c0a387ad3 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestNDArrayCreation.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestNDArrayCreation.java
@@ -44,9 +44,8 @@ import static org.junit.jupiter.api.Assertions.*;
 @Slf4j
 public class TestNDArrayCreation extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBufferCreation(Nd4jBackend backend) {
         DataBuffer dataBuffer = Nd4j.createBuffer(new float[] {1, 2});
         Pointer pointer = dataBuffer.pointer();
@@ -68,7 +67,7 @@ public class TestNDArrayCreation extends BaseNd4jTestWithBackends {
     @Test
     @Disabled
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCreateNpy() throws Exception {
         INDArray arrCreate = Nd4j.createFromNpyFile(new ClassPathResource("nd4j-tests/test.npy").getFile());
         assertEquals(2, arrCreate.size(0));
@@ -83,7 +82,7 @@ public class TestNDArrayCreation extends BaseNd4jTestWithBackends {
     @Test
     @Disabled
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCreateNpz(Nd4jBackend backend) throws Exception {
         Map<String, INDArray> map = Nd4j.createFromNpzFile(new ClassPathResource("nd4j-tests/test.npz").getFile());
         assertEquals(true, map.containsKey("x"));
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestNDArrayCreationUtil.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestNDArrayCreationUtil.java
index 4f7823622..3919ea8e5 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestNDArrayCreationUtil.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestNDArrayCreationUtil.java
@@ -35,9 +35,8 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 public class TestNDArrayCreationUtil extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testShapes() {
 
         long[] shape2d = {2, 3};
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestNamespaces.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestNamespaces.java
index 836a3d5eb..258177261 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestNamespaces.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/TestNamespaces.java
@@ -32,9 +32,8 @@ import org.nd4j.linalg.factory.Nd4jBackend;
 public class TestNamespaces extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBitwiseSimple(Nd4jBackend backend){
 
         INDArray x = Nd4j.rand(DataType.FLOAT, 1, 5).muli(100000).castTo(DataType.INT);
@@ -50,9 +49,8 @@ public class TestNamespaces extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMathSimple(Nd4jBackend backend) {
         INDArray x = Nd4j.rand(DataType.FLOAT, 1, 5).muli(2).subi(1);
         INDArray abs = Nd4j.math.abs(x);
@@ -67,9 +65,8 @@ public class TestNamespaces extends BaseNd4jTestWithBackends {
 //        System.out.println(cm);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRandomSimple(Nd4jBackend backend){
         INDArray normal = Nd4j.random.normal(0, 1, DataType.FLOAT, 10);
 //        System.out.println(normal);
@@ -77,9 +74,8 @@ public class TestNamespaces extends BaseNd4jTestWithBackends {
 //        System.out.println(uniform);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNeuralNetworkSimple(Nd4jBackend backend){
         INDArray out = Nd4j.nn.elu(Nd4j.random.normal(0, 1, DataType.FLOAT, 10));
 //        System.out.println(out);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/blas/LapackTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/blas/LapackTest.java
index bb569f928..d130b286f 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/blas/LapackTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/blas/LapackTest.java
@@ -36,9 +36,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class LapackTest extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testQRSquare(Nd4jBackend backend) {
         INDArray A = Nd4j.create(new double[] {1, 2, 3, 4, 5, 6, 7, 8, 9});
         A = A.reshape('c', 3, 3);
@@ -56,9 +55,8 @@ public class LapackTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testQRRect(Nd4jBackend backend) {
         INDArray A = Nd4j.create(new double[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12});
         A = A.reshape('f', 4, 3);
@@ -76,9 +74,8 @@ public class LapackTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCholeskyL(Nd4jBackend backend) {
         INDArray A = Nd4j.create(new double[] {2, -1, 1, -1, 2, -1, 1, -1, 2,});
         A = A.reshape('c', 3, 3);
@@ -95,9 +92,8 @@ public class LapackTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCholeskyU(Nd4jBackend backend) {
         INDArray A = Nd4j.create(new double[] {3, -1, 2, -1, 3, -1, 2, -1, 3,});
         A = A.reshape('f', 3, 3);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/blas/Level1Test.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/blas/Level1Test.java
index b9ed7c336..1584b72dc 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/blas/Level1Test.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/blas/Level1Test.java
@@ -39,9 +39,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class Level1Test extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDot(Nd4jBackend backend) {
         INDArray vec1 = Nd4j.create(new float[] {1, 2, 3, 4});
         INDArray vec2 = Nd4j.create(new float[] {1, 2, 3, 4});
@@ -54,9 +53,8 @@ public class Level1Test extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAxpy(Nd4jBackend backend) {
         INDArray matrix = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray row = matrix.getRow(1);
@@ -65,9 +63,8 @@ public class Level1Test extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAxpy2(Nd4jBackend backend) {
         val rowX = Nd4j.create(new double[]{1, 2, 3, 4});
         val rowY = Nd4j.create(new double[]{1, 2, 3, 4});
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/blas/Level2Test.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/blas/Level2Test.java
index 9c22b88a9..252109aac 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/blas/Level2Test.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/blas/Level2Test.java
@@ -34,9 +34,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class Level2Test extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemv1(Nd4jBackend backend) {
         INDArray array1 = Nd4j.linspace(1, 1000, 1000).reshape(10, 100);
         INDArray array2 = Nd4j.linspace(1, 100, 100).reshape(100, 1);
@@ -50,9 +49,8 @@ public class Level2Test extends BaseNd4jTestWithBackends {
         assertEquals(1853350f, array3.getFloat(3), 0.001f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemv2(Nd4jBackend backend) {
         INDArray array1 = Nd4j.linspace(1, 1000, 1000).reshape(10, 100);
         INDArray array2 = Nd4j.linspace(1, 100, 100).reshape('f', 100, 1);
@@ -66,9 +64,8 @@ public class Level2Test extends BaseNd4jTestWithBackends {
         assertEquals(1853350f, array3.getFloat(3), 0.001f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemv3(Nd4jBackend backend) {
         INDArray array1 = Nd4j.linspace(1, 1000, 1000).reshape('f', 10, 100);
         INDArray array2 = Nd4j.linspace(1, 100, 100).reshape('f', 100, 1);
@@ -82,9 +79,8 @@ public class Level2Test extends BaseNd4jTestWithBackends {
         assertEquals(3353200f, array3.getFloat(3), 0.001f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemv4(Nd4jBackend backend) {
         INDArray array1 = Nd4j.linspace(1, 1000, 1000).reshape('f', 10, 100);
         INDArray array2 = Nd4j.linspace(1, 100, 100).reshape(100, 1);
@@ -98,9 +94,8 @@ public class Level2Test extends BaseNd4jTestWithBackends {
         assertEquals(3353200f, array3.getFloat(3), 0.001f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemv5(Nd4jBackend backend) {
         INDArray array1 = Nd4j.linspace(1, 1000, 1000).reshape(10, 100);
         INDArray array2 = Nd4j.linspace(1, 100, 100).reshape(100, 1);
@@ -116,9 +111,8 @@ public class Level2Test extends BaseNd4jTestWithBackends {
         assertEquals(1853350f, array3.getFloat(3), 0.001f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemv6(Nd4jBackend backend) {
         INDArray array1 = Nd4j.linspace(1, 1000, 1000).reshape('f', 10, 100);
         INDArray array2 = Nd4j.linspace(1, 100, 100).reshape(100, 1);
@@ -134,9 +128,8 @@ public class Level2Test extends BaseNd4jTestWithBackends {
         assertEquals(3353200f, array3.getFloat(3), 0.001f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemv7(Nd4jBackend backend) {
         INDArray array1 = Nd4j.linspace(1, 1000, 1000).reshape('f', 10, 100);
         INDArray array2 = Nd4j.linspace(1, 100, 100).reshape(100, 1);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/blas/Level3Test.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/blas/Level3Test.java
index 80d9b0896..c9113a1f6 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/blas/Level3Test.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/blas/Level3Test.java
@@ -34,9 +34,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class Level3Test extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemm1(Nd4jBackend backend) {
         INDArray array1 = Nd4j.linspace(1, 100, 100).reshape(1, 100);
         INDArray array2 = Nd4j.linspace(1, 100, 100).reshape(100, 1);
@@ -46,9 +45,8 @@ public class Level3Test extends BaseNd4jTestWithBackends {
         assertEquals(338350f, array3.getFloat(0), 0.001f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemm2(Nd4jBackend backend) {
         INDArray array1 = Nd4j.linspace(1, 100, 100).reshape('f', 1, 100);
         INDArray array2 = Nd4j.linspace(1, 100, 100).reshape('f', 100, 1);
@@ -58,9 +56,8 @@ public class Level3Test extends BaseNd4jTestWithBackends {
         assertEquals(338350f, array3.getFloat(0), 0.001f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemm3(Nd4jBackend backend) {
         INDArray array1 = Nd4j.linspace(1, 1000, 1000).reshape(10, 100);
         INDArray array2 = Nd4j.linspace(1, 1000, 1000).reshape(100, 10);
@@ -78,9 +75,8 @@ public class Level3Test extends BaseNd4jTestWithBackends {
         assertEquals(8328150.0f, array3.data().getFloat(21), 0.001f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemm4(Nd4jBackend backend) {
         INDArray array1 = Nd4j.linspace(1, 1000, 1000).reshape(10, 100);
         INDArray array2 = Nd4j.linspace(1, 1000, 1000).reshape('f', 100, 10);
@@ -97,9 +93,8 @@ public class Level3Test extends BaseNd4jTestWithBackends {
         assertEquals(3853350f, array3.data().getFloat(21), 0.001f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemm5(Nd4jBackend backend) {
         INDArray array1 = Nd4j.linspace(1, 1000, 1000).reshape('f', 10, 100);
         INDArray array2 = Nd4j.linspace(1, 1000, 1000).reshape(100, 10);
@@ -113,9 +108,8 @@ public class Level3Test extends BaseNd4jTestWithBackends {
         assertEquals(3.3835E7f, array3.data().getFloat(99), 10f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemm6(Nd4jBackend backend) {
         INDArray array1 = Nd4j.linspace(1, 1000, 1000).reshape('f', 10, 100);
         INDArray array2 = Nd4j.linspace(1, 1000, 1000).reshape('f', 100, 10);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/blas/params/ParamsTestsF.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/blas/params/ParamsTestsF.java
index 605d318fe..f2b072c8f 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/blas/params/ParamsTestsF.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/blas/params/ParamsTestsF.java
@@ -37,9 +37,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ParamsTestsF extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemm (Nd4jBackend backend) {
         INDArray a = Nd4j.create(2, 2);
         INDArray b = Nd4j.create(2, 3);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/DataBufferTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/DataBufferTests.java
index 442de77db..e10bab8af 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/DataBufferTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/DataBufferTests.java
@@ -53,7 +53,7 @@ public class DataBufferTests extends BaseNd4jTestWithBackends {
     @Test
     @Disabled("AB 2019/06/03 - CI issue: \"CUDA stream synchronization failed\" - see issue 7657")
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNoArgCreateBufferFromArray(Nd4jBackend backend) {
 
         //Tests here:
@@ -279,9 +279,8 @@ public class DataBufferTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCreateTypedBuffer(Nd4jBackend backend) {
 
         WorkspaceConfiguration initialConfig = WorkspaceConfiguration.builder().initialSize(10 * 1024L * 1024L)
@@ -351,9 +350,8 @@ public class DataBufferTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAsBytes(Nd4jBackend backend) {
         INDArray orig = Nd4j.linspace(DataType.INT, 0, 10, 1);
 
@@ -408,9 +406,8 @@ public class DataBufferTests extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEnsureLocation(){
         //https://github.com/eclipse/deeplearning4j/issues/8783
         Nd4j.create(1);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/DataTypeValidationTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/DataTypeValidationTests.java
index 1668deda3..3e7971eed 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/DataTypeValidationTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/DataTypeValidationTests.java
@@ -72,7 +72,7 @@ public class DataTypeValidationTests extends BaseNd4jTestWithBackends {
      */
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBlasValidation1(Nd4jBackend backend) {
        assertThrows(ND4JIllegalStateException.class,() -> {
            INDArray x = Nd4j.create(10);
@@ -91,7 +91,7 @@ public class DataTypeValidationTests extends BaseNd4jTestWithBackends {
      */
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBlasValidation2(Nd4jBackend backend) {
         assertThrows(RuntimeException.class,() -> {
             INDArray a = Nd4j.create(100, 10);
@@ -111,7 +111,7 @@ public class DataTypeValidationTests extends BaseNd4jTestWithBackends {
      */
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBlasValidation3(Nd4jBackend backend) {
        assertThrows(IllegalStateException.class,() -> {
            INDArray x = Nd4j.create(100, 100);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/DoubleDataBufferTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/DoubleDataBufferTest.java
index 58ac518f8..e2ee38913 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/DoubleDataBufferTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/DoubleDataBufferTest.java
@@ -76,9 +76,8 @@ public class DoubleDataBufferTest extends BaseNd4jTestWithBackends {
         DataTypeUtil.setDTypeForContext(initialType);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPointerCreation(Nd4jBackend backend) {
         DoublePointer floatPointer = new DoublePointer(1, 2, 3, 4);
         Indexer indexer = DoubleIndexer.create(floatPointer);
@@ -87,9 +86,8 @@ public class DoubleDataBufferTest extends BaseNd4jTestWithBackends {
         assertArrayEquals(other.asDouble(), buffer.asDouble(), 0.001);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetSet(Nd4jBackend backend) {
         double[] d1 = new double[] {1, 2, 3, 4};
         DataBuffer d = Nd4j.createBuffer(d1);
@@ -100,9 +98,8 @@ public class DoubleDataBufferTest extends BaseNd4jTestWithBackends {
 
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSerialization2() throws Exception {
         INDArray[] arr = new INDArray[] {Nd4j.ones(1, 10),
                 //      Nd4j.ones(5,10).getRow(2)
@@ -130,9 +127,8 @@ public class DoubleDataBufferTest extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSerialization(@TempDir Path testDir) throws Exception {
         File dir = testDir.toFile();
         DataBuffer buf = Nd4j.createBuffer(5);
@@ -154,9 +150,8 @@ public class DoubleDataBufferTest extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDup(Nd4jBackend backend) {
         double[] d1 = new double[] {1, 2, 3, 4};
         DataBuffer d = Nd4j.createBuffer(d1);
@@ -166,9 +161,8 @@ public class DoubleDataBufferTest extends BaseNd4jTestWithBackends {
 
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPut(Nd4jBackend backend) {
         double[] d1 = new double[] {1, 2, 3, 4};
         DataBuffer d = Nd4j.createBuffer(d1);
@@ -179,9 +173,8 @@ public class DoubleDataBufferTest extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetRange(Nd4jBackend backend) {
         DataBuffer buffer = Nd4j.linspace(1, 5, 5, DataType.DOUBLE).data();
         double[] get = buffer.getDoublesAt(0, 3);
@@ -196,9 +189,8 @@ public class DoubleDataBufferTest extends BaseNd4jTestWithBackends {
 
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetOffsetRange(Nd4jBackend backend) {
         DataBuffer buffer = Nd4j.linspace(1, 5, 5, DataType.DOUBLE).data();
         double[] get = buffer.getDoublesAt(1, 3);
@@ -213,9 +205,8 @@ public class DoubleDataBufferTest extends BaseNd4jTestWithBackends {
 
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAssign(Nd4jBackend backend) {
         DataBuffer assertion = Nd4j.createBuffer(new double[] {1, 2, 3});
         DataBuffer one = Nd4j.createBuffer(new double[] {1});
@@ -226,9 +217,8 @@ public class DoubleDataBufferTest extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOffset(Nd4jBackend backend) {
         DataBuffer create = Nd4j.createBuffer(new double[] {1, 2, 3, 4}, 2);
         assertEquals(2, create.length());
@@ -238,9 +228,8 @@ public class DoubleDataBufferTest extends BaseNd4jTestWithBackends {
 
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReallocation(Nd4jBackend backend) {
         DataBuffer buffer = Nd4j.createBuffer(new double[] {1, 2, 3, 4});
         assertEquals(4, buffer.capacity());
@@ -250,9 +239,8 @@ public class DoubleDataBufferTest extends BaseNd4jTestWithBackends {
         assertArrayEquals(old, Arrays.copyOf(buffer.asDouble(), 4), 1e-1);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReallocationWorkspace(Nd4jBackend backend) {
         WorkspaceConfiguration initialConfig = WorkspaceConfiguration.builder().initialSize(10 * 1024L * 1024L)
                 .policyAllocation(AllocationPolicy.STRICT).policyLearning(LearningPolicy.NONE).build();
@@ -269,9 +257,8 @@ public class DoubleDataBufferTest extends BaseNd4jTestWithBackends {
 
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAddressPointer(){
         if( Nd4j.getExecutioner().type() !=  OpExecutioner.ExecutionerType.NATIVE_CPU ){
             return;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/FloatDataBufferTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/FloatDataBufferTest.java
index d37aca6d6..5f4fd3665 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/FloatDataBufferTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/FloatDataBufferTest.java
@@ -72,9 +72,8 @@ public class FloatDataBufferTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPointerCreation(Nd4jBackend backend) {
         FloatPointer floatPointer = new FloatPointer(1, 2, 3, 4);
         Indexer indexer = FloatIndexer.create(floatPointer);
@@ -83,9 +82,8 @@ public class FloatDataBufferTest extends BaseNd4jTestWithBackends {
         assertArrayEquals(other.asFloat(), buffer.asFloat(), 0.001f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetSet(Nd4jBackend backend) {
         float[] d1 = new float[] {1, 2, 3, 4};
         DataBuffer d = Nd4j.createBuffer(d1);
@@ -96,9 +94,8 @@ public class FloatDataBufferTest extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSerialization(@TempDir Path tempDir,Nd4jBackend backend) throws Exception {
         File dir = tempDir.toFile();
         DataBuffer buf = Nd4j.createBuffer(5);
@@ -119,9 +116,8 @@ public class FloatDataBufferTest extends BaseNd4jTestWithBackends {
         assertArrayEquals(buf.asFloat(), buf2.asFloat(), 0.0001f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDup(Nd4jBackend backend) {
         float[] d1 = new float[] {1, 2, 3, 4};
         DataBuffer d = Nd4j.createBuffer(d1);
@@ -129,9 +125,8 @@ public class FloatDataBufferTest extends BaseNd4jTestWithBackends {
         assertArrayEquals(d.asFloat(), d2.asFloat(), 0.001f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToNio(Nd4jBackend backend) {
         DataBuffer buff = Nd4j.createTypedBuffer(new double[] {1, 2, 3, 4}, DataType.FLOAT);
         assertEquals(4, buff.length());
@@ -143,9 +138,8 @@ public class FloatDataBufferTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPut(Nd4jBackend backend) {
         float[] d1 = new float[] {1, 2, 3, 4};
         DataBuffer d = Nd4j.createBuffer(d1);
@@ -156,9 +150,8 @@ public class FloatDataBufferTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetRange(Nd4jBackend backend) {
         DataBuffer buffer = Nd4j.linspace(1, 5, 5).data();
         float[] get = buffer.getFloatsAt(0, 3);
@@ -174,9 +167,8 @@ public class FloatDataBufferTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetOffsetRange(Nd4jBackend backend) {
         DataBuffer buffer = Nd4j.linspace(1, 5, 5).data();
         float[] get = buffer.getFloatsAt(1, 3);
@@ -193,9 +185,8 @@ public class FloatDataBufferTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAsBytes(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(5);
         byte[] d = arr.data().asBytes();
@@ -205,9 +196,8 @@ public class FloatDataBufferTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAssign(Nd4jBackend backend) {
         DataBuffer assertion = Nd4j.createBuffer(new double[] {1, 2, 3});
         DataBuffer one = Nd4j.createBuffer(new double[] {1});
@@ -217,9 +207,8 @@ public class FloatDataBufferTest extends BaseNd4jTestWithBackends {
         assertArrayEquals(assertion.asFloat(), blank.asFloat(), 0.0001f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReadWrite(Nd4jBackend backend) throws Exception {
         DataBuffer assertion = Nd4j.createBuffer(new double[] {1, 2, 3});
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -233,9 +222,8 @@ public class FloatDataBufferTest extends BaseNd4jTestWithBackends {
         assertArrayEquals(assertion.asFloat(), clone.asFloat(), 0.0001f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOffset(Nd4jBackend backend) {
         DataBuffer create = Nd4j.createBuffer(new float[] {1, 2, 3, 4}, 2);
         assertEquals(2, create.length());
@@ -245,9 +233,8 @@ public class FloatDataBufferTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReallocation(Nd4jBackend backend) {
         DataBuffer buffer = Nd4j.createBuffer(new float[] {1, 2, 3, 4});
         assertEquals(4, buffer.capacity());
@@ -258,9 +245,8 @@ public class FloatDataBufferTest extends BaseNd4jTestWithBackends {
         assertArrayEquals(old, newBuf, 1e-4F);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReallocationWorkspace(Nd4jBackend backend) {
         WorkspaceConfiguration initialConfig = WorkspaceConfiguration.builder().initialSize(10 * 1024L * 1024L)
                         .policyAllocation(AllocationPolicy.STRICT).policyLearning(LearningPolicy.NONE).build();
@@ -277,9 +263,8 @@ public class FloatDataBufferTest extends BaseNd4jTestWithBackends {
         workspace.close();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAddressPointer(Nd4jBackend backend){
         if( Nd4j.getExecutioner().type() !=  OpExecutioner.ExecutionerType.NATIVE_CPU ){
             return;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/IntDataBufferTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/IntDataBufferTests.java
index 1dccbb338..8e1b3646e 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/IntDataBufferTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/buffer/IntDataBufferTests.java
@@ -42,9 +42,8 @@ import static org.junit.jupiter.api.Assertions.*;
 public class IntDataBufferTests extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicSerde1() throws Exception {
 
 
@@ -82,9 +81,8 @@ public class IntDataBufferTests extends BaseNd4jTestWithBackends {
     }
     */
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReallocation(Nd4jBackend backend) {
         DataBuffer buffer = Nd4j.createBuffer(new int[] {1, 2, 3, 4});
         assertEquals(4, buffer.capacity());
@@ -96,9 +94,8 @@ public class IntDataBufferTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(old, Arrays.copyOf(newContent, old.length));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReallocationWorkspace(Nd4jBackend backend) {
         WorkspaceConfiguration initialConfig = WorkspaceConfiguration.builder().initialSize(10 * 1024L * 1024L)
                 .policyAllocation(AllocationPolicy.STRICT).policyLearning(LearningPolicy.NONE).build();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/IndexingTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/IndexingTests.java
index 1d4cc1123..4dcbf8fb8 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/IndexingTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/IndexingTests.java
@@ -43,9 +43,8 @@ public class IndexingTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testINDArrayIndexingEqualToRank(Nd4jBackend backend) {
         INDArray x = Nd4j.linspace(1,6,6, DataType.DOUBLE).reshape('c',3,2).castTo(DataType.DOUBLE);
         INDArray indexes = Nd4j.create(new double[][]{
@@ -60,9 +59,8 @@ public class IndexingTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testINDArrayIndexingLessThanRankSimple(Nd4jBackend backend) {
         INDArray x = Nd4j.linspace(1,6,6, DataType.DOUBLE).reshape('c',3,2).castTo(DataType.DOUBLE);
         INDArray indexes = Nd4j.create(new double[][]{
@@ -76,9 +74,8 @@ public class IndexingTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testINDArrayIndexingLessThanRankFourDimension(Nd4jBackend backend) {
         INDArray x = Nd4j.linspace(1,16,16, DataType.DOUBLE).reshape('c',2,2,2,2).castTo(DataType.DOUBLE);
         INDArray indexes = Nd4j.create(new double[][]{
@@ -91,9 +88,8 @@ public class IndexingTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPutSimple(Nd4jBackend backend) {
         INDArray x = Nd4j.linspace(1,16,16, DataType.DOUBLE).reshape('c',2,2,2,2);
         INDArray indexes = Nd4j.create(new double[][]{
@@ -105,9 +101,8 @@ public class IndexingTests extends BaseNd4jTestWithBackends {
         assertEquals(vals,x);
     }
     
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetScalar(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 5, 5, DataType.DOUBLE);
         INDArray d = arr.get(NDArrayIndex.point(1));
@@ -116,18 +111,16 @@ public class IndexingTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNewAxis(Nd4jBackend backend) {
         INDArray arr = Nd4j.rand(new int[] {4, 2, 3});
         INDArray view = arr.get(NDArrayIndex.newAxis(), NDArrayIndex.all(), NDArrayIndex.point(1));
 //        System.out.println(view);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVectorIndexing(Nd4jBackend backend) {
         INDArray x = Nd4j.linspace(0, 10, 11, DataType.DOUBLE).reshape(1, 11).castTo(DataType.DOUBLE);
         int[] index = new int[] {5, 8, 9};
@@ -139,9 +132,8 @@ public class IndexingTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetRowsColumnsMatrix(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 24, 24, DataType.DOUBLE).reshape(4, 6);
         INDArray firstAndSecondColumnsAssertion = Nd4j.create(new double[][] {{1, 5}, {2, 6}, {3, 7}, {4, 8}});
@@ -159,9 +151,8 @@ public class IndexingTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSlicing(Nd4jBackend backend) {
         INDArray arange = Nd4j.arange(1, 17).reshape(4, 4).castTo(DataType.DOUBLE);
         INDArray slice1Assert = Nd4j.create(new double[] {2, 6, 10, 14});
@@ -169,9 +160,8 @@ public class IndexingTests extends BaseNd4jTestWithBackends {
         assertEquals(slice1Assert, slice1Test);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArangeMul(Nd4jBackend backend) {
         INDArray arange = Nd4j.arange(1, 17).reshape('f', 4, 4).castTo(DataType.DOUBLE);
         INDArrayIndex index = NDArrayIndex.interval(0, 2);
@@ -183,9 +173,8 @@ public class IndexingTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetIndicesVector(Nd4jBackend backend) {
         INDArray line = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(1, -1);
         INDArray test = Nd4j.create(new double[] {2, 3});
@@ -193,9 +182,8 @@ public class IndexingTests extends BaseNd4jTestWithBackends {
         assertEquals(test, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetIndicesVectorView(Nd4jBackend backend) {
         INDArray matrix = Nd4j.linspace(1, 25, 25, DataType.DOUBLE).reshape('c',5, 5);
         INDArray column = matrix.getColumn(0).reshape(1,5);
@@ -213,9 +201,8 @@ public class IndexingTests extends BaseNd4jTestWithBackends {
         assertEquals(exp2, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test2dGetPoint(Nd4jBackend backend){
         INDArray arr = Nd4j.linspace(1,12,12, DataType.DOUBLE).reshape('c',3,4);
         for( int i=0; i<3; i++ ){
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/IndexingTestsC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/IndexingTestsC.java
index b9f361df3..45ef02238 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/IndexingTestsC.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/IndexingTestsC.java
@@ -56,9 +56,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
 
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNegativeBounds() {
        INDArray arr = Nd4j.linspace(1,10,10, DataType.DOUBLE).reshape(2,5);
        INDArrayIndex interval = NDArrayIndex.interval(0,1,-2,arr.size(1));
@@ -70,9 +69,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
        assertEquals(assertion,get);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNewAxis() {
         INDArray arr = Nd4j.linspace(1, 12, 12, DataType.DOUBLE).reshape(3, 2, 2);
         INDArray get = arr.get(NDArrayIndex.all(), NDArrayIndex.all(), newAxis(), newAxis(), all());
@@ -81,9 +79,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void broadcastBug() {
         INDArray a = Nd4j.create(new double[] {1.0, 2.0, 3.0, 4.0}, new int[] {2, 2});
         final INDArray col = a.get(NDArrayIndex.all(), NDArrayIndex.point(0));
@@ -94,9 +91,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIntervalsIn3D() {
         INDArray arr = Nd4j.arange(8).reshape(2, 2, 2).castTo(DataType.DOUBLE);
         INDArray assertion = Nd4j.create(new double[][] {{4, 5}, {6, 7}}).reshape(1, 2, 2);
@@ -105,9 +101,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSmallInterval() {
         INDArray arr = Nd4j.arange(8).reshape(2, 2, 2).castTo(DataType.DOUBLE);
         INDArray assertion = Nd4j.create(new double[][] {{4, 5}, {6, 7}}).reshape(1, 2, 2);
@@ -116,9 +111,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllWithNewAxisAndInterval() {
         INDArray arr = Nd4j.linspace(1, 24, 24, DataType.DOUBLE).reshape(4, 2, 3);
         INDArray assertion2 = Nd4j.create(new double[][] {{7, 8, 9},}).reshape(1, 1, 3);
@@ -127,9 +121,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion2, get2);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllWithNewAxisInMiddle() {
         INDArray arr = Nd4j.linspace(1, 24, 24, DataType.DOUBLE).reshape(4, 2, 3);
         INDArray assertion2 = Nd4j.create(new double[][] {{7, 8, 9}, {10, 11, 12}}).reshape(1, 2, 3);
@@ -138,9 +131,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion2, get2);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllWithNewAxis() {
         INDArray arr = Nd4j.linspace(1, 24, 24, DataType.DOUBLE).reshape(4, 2, 3);
         INDArray get = arr.get(newAxis(), all(), point(1));
@@ -150,9 +142,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIndexingWithMmul() {
         INDArray a = Nd4j.linspace(1, 9, 9, DataType.DOUBLE).reshape(3, 3);
         INDArray b = Nd4j.linspace(1, 5, 5, DataType.DOUBLE).reshape(1, -1);
@@ -163,9 +154,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, c);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPointPointInterval() {
         INDArray wholeArr = Nd4j.linspace(1, 36, 36, DataType.DOUBLE).reshape(4, 3, 3);
         INDArray get = wholeArr.get(point(0), interval(1, 3), interval(1, 3));
@@ -174,9 +164,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, get);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIntervalLowerBound() {
         INDArray wholeArr = Nd4j.linspace(1, 24, 24, DataType.DOUBLE).reshape(4, 2, 3);
         INDArray subarray = wholeArr.get(interval(1, 3), NDArrayIndex.point(0), NDArrayIndex.indices(0, 2));
@@ -187,9 +176,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetPointRowVector() {
         INDArray arr = Nd4j.linspace(1, 1000, 1000, DataType.DOUBLE).reshape(1, -1);
 
@@ -199,9 +187,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.linspace(1, 100, 100, DataType.DOUBLE), arr2);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSpecifiedIndexVector() {
         INDArray rootMatrix = Nd4j.linspace(1, 16, 16, DataType.DOUBLE).reshape(4, 4);
         INDArray threeD = Nd4j.linspace(1, 16, 16, DataType.DOUBLE).reshape(2, 2, 2, 2);
@@ -218,9 +205,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPutRowIndexing() {
         INDArray arr = Nd4j.ones(1, 10);
         INDArray row = Nd4j.create(1, 10);
@@ -230,9 +216,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(arr, row);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVectorIndexing2() {
         INDArray wholeVector = Nd4j.linspace(1, 5, 5, DataType.DOUBLE).get(interval(1, 2, 3, true));
         INDArray assertion = Nd4j.create(new double[] {2, 4});
@@ -247,9 +232,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOffsetsC() {
         INDArray arr = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         assertEquals(3, NDArrayIndex.offset(arr, 1, 1));
@@ -265,9 +249,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIndexFor() {
         long[] shape = {1, 2};
         INDArrayIndex[] indexes = NDArrayIndex.indexesFor(shape);
@@ -276,9 +259,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetScalar() {
         INDArray arr = Nd4j.linspace(1, 5, 5, DataType.DOUBLE);
         INDArray d = arr.get(point(1));
@@ -287,9 +269,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVectorIndexing() {
         INDArray arr = Nd4j.linspace(1, 10, 10, DataType.DOUBLE).reshape(1, -1);
         INDArray assertion = Nd4j.create(new double[] {2, 3, 4, 5});
@@ -297,18 +278,16 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, viewTest);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNegativeIndices() {
         INDArray test = Nd4j.create(10, 10, 10);
         test.putScalar(new int[] {0, 0, -1}, 1.0);
         assertEquals(1.0, test.getScalar(0, 0, -1).sumNumber());
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetIndices2d() {
         INDArray twoByTwo = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(3, 2);
         INDArray firstRow = twoByTwo.getRow(0);
@@ -326,9 +305,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.create(new double[] {4}, new int[]{1,1}), individualElement);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetRow() {
         Nd4j.getRandom().setSeed(12345);
         INDArray in = Nd4j.linspace(0, 14, 15, DataType.DOUBLE).reshape(3, 5);
@@ -345,9 +323,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetRowEdgeCase() {
         INDArray rowVec = Nd4j.linspace(1, 5, 5, DataType.DOUBLE).reshape(1, -1);
         INDArray get = rowVec.getRow(0); //Returning shape [1,1]
@@ -356,9 +333,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(rowVec, get);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetColumnEdgeCase() {
         INDArray colVec = Nd4j.linspace(1, 5, 5, DataType.DOUBLE).reshape(1, -1).transpose();
         INDArray get = colVec.getColumn(0); //Returning shape [1,1]
@@ -367,9 +343,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(colVec, get);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcatColumns() {
         INDArray input1 = Nd4j.zeros(2, 1).castTo(DataType.DOUBLE);
         INDArray input2 = Nd4j.ones(2, 1).castTo(DataType.DOUBLE);
@@ -378,9 +353,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, concat);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetIndicesVector() {
         INDArray line = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(1, -1);
         INDArray test = Nd4j.create(new double[] {2, 3});
@@ -388,9 +362,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(test, result);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArangeMul() {
         INDArray arange = Nd4j.arange(1, 17).reshape(4, 4).castTo(DataType.DOUBLE);
         INDArrayIndex index = interval(0, 2);
@@ -401,9 +374,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, mul);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIndexingThorough(){
         long[] fullShape = {3,4,5,6,7};
 
@@ -603,9 +575,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         return d;
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void debugging(){
         long[] inShape = {3,4};
         INDArrayIndex[] indexes = new INDArrayIndex[]{NDArrayIndex.point(0), NDArrayIndex.interval(1, 2, 4)};
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/resolve/NDArrayIndexResolveTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/resolve/NDArrayIndexResolveTests.java
index 1177d0a4a..fa69cbe58 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/resolve/NDArrayIndexResolveTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/resolve/NDArrayIndexResolveTests.java
@@ -41,9 +41,8 @@ import static org.junit.jupiter.api.Assertions.*;
 public class NDArrayIndexResolveTests extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testResolvePoint(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 4, 4).reshape(2, 2);
         INDArrayIndex[] test = NDArrayIndex.resolve(arr.shape(), NDArrayIndex.point(1));
@@ -58,9 +57,8 @@ public class NDArrayIndexResolveTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testResolvePointVector() {
         INDArray arr = Nd4j.linspace(1, 4, 4);
         INDArrayIndex[] getPoint = {NDArrayIndex.point(1)};
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/shape/IndexShapeTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/shape/IndexShapeTests.java
index db08ba1db..38ce6a6f0 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/shape/IndexShapeTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/shape/IndexShapeTests.java
@@ -40,9 +40,8 @@ public class IndexShapeTests extends BaseNd4jTestWithBackends {
 
     private int[] shape = {1, 1, 2, 1, 3, 4, 5, 1};
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSinglePoint(Nd4jBackend backend) {
         /*
         Assumes all indexes are filled out.
@@ -73,9 +72,8 @@ public class IndexShapeTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInterval(Nd4jBackend backend) {
         int[] basicAssertion = {1, 1, 1, 1, 3, 1, 2, 1};
         INDArrayIndex[] basicTest = {NDArrayIndex.all(), NDArrayIndex.all(), NDArrayIndex.interval(0, 1),
@@ -86,9 +84,8 @@ public class IndexShapeTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNewAxis(Nd4jBackend backend) {
         //normal prepend
         int[] prependAssertion = {1, 1, 1, 1, 2, 1, 3, 4, 5, 1};
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/shape/IndexShapeTests2d.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/shape/IndexShapeTests2d.java
index cd81c5aa1..4176c98df 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/shape/IndexShapeTests2d.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/shape/IndexShapeTests2d.java
@@ -41,18 +41,16 @@ public class IndexShapeTests2d extends BaseNd4jTestWithBackends {
     private long[] shape = {3, 2};
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test2dCases(Nd4jBackend backend) {
         assertArrayEquals(new long[] {1, 2}, Indices.shape(shape, NDArrayIndex.point(1)));
         assertArrayEquals(new long[] {3, 1},
                         Indices.shape(shape, NDArrayIndex.all(), NDArrayIndex.point(1)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNewAxis2d(Nd4jBackend backend) {
         assertArrayEquals(new long[] {1, 3, 2}, Indices.shape(shape,
                 NDArrayIndex.newAxis(), NDArrayIndex.all(), NDArrayIndex.all()));
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/iterator/NDIndexIteratorTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/iterator/NDIndexIteratorTest.java
index c93c159f8..41fc72a31 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/iterator/NDIndexIteratorTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/iterator/NDIndexIteratorTest.java
@@ -38,9 +38,8 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 public class NDIndexIteratorTest extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIterate(Nd4jBackend backend) {
         val shapeIter = new NdIndexIterator(2, 2);
         val possibleSolutions = new long[][] {{0, 0}, {0, 1}, {1, 0}, {1, 1},};
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestNdArrReadWriteTxt.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestNdArrReadWriteTxt.java
index bc2859129..694016812 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestNdArrReadWriteTxt.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestNdArrReadWriteTxt.java
@@ -49,9 +49,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TestNdArrReadWriteTxt extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void compareAfterWrite(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         int [] ranksToCheck = new int[] {0,1,2,3,4};
         for (int i = 0; i < ranksToCheck.length; i++) {
@@ -81,9 +80,8 @@ public class TestNdArrReadWriteTxt extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNd4jReadWriteText(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
 
         File dir = testDir.toFile();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestNdArrReadWriteTxtC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestNdArrReadWriteTxtC.java
index 1c269405c..f8dcfda03 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestNdArrReadWriteTxtC.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestNdArrReadWriteTxtC.java
@@ -40,9 +40,8 @@ import static org.nd4j.linalg.api.ndarray.TestNdArrReadWriteTxt.compareArrays;
 public class TestNdArrReadWriteTxtC extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void compareAfterWrite(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         int[] ranksToCheck = new int[]{0, 1, 2, 3, 4};
         for (int i = 0; i < ranksToCheck.length; i++) {
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestSerialization.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestSerialization.java
index 3590d2b30..fd055618e 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestSerialization.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestSerialization.java
@@ -37,9 +37,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class TestSerialization extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSerializationFullArrayNd4jWriteRead(Nd4jBackend backend) throws Exception {
         int length = 100;
         INDArray arrC = Nd4j.linspace(1, length, length).reshape('c', 10, 10);
@@ -69,9 +68,8 @@ public class TestSerialization extends BaseNd4jTestWithBackends {
         assertEquals(arrF, arr2F);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSerializationFullArrayJava(Nd4jBackend backend) throws Exception {
         int length = 100;
         INDArray arrC = Nd4j.linspace(1, length, length).reshape('c', 10, 10);
@@ -102,9 +100,8 @@ public class TestSerialization extends BaseNd4jTestWithBackends {
         assertEquals(arrF, arr2F);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSerializationOnViewsNd4jWriteRead(Nd4jBackend backend) throws Exception {
         int length = 100;
         INDArray arrC = Nd4j.linspace(1, length, length).reshape('c', 10, 10);
@@ -140,9 +137,8 @@ public class TestSerialization extends BaseNd4jTestWithBackends {
         assertEquals(subF, arr2F);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSerializationOnViewsJava(Nd4jBackend backend) throws Exception {
         int length = 100;
         INDArray arrC = Nd4j.linspace(1, length, length).reshape('c', 10, 10);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestSerializationDoubleToFloat.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestSerializationDoubleToFloat.java
index fedb11724..fabe36d64 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestSerializationDoubleToFloat.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestSerializationDoubleToFloat.java
@@ -51,9 +51,8 @@ public class TestSerializationDoubleToFloat extends BaseNd4jTestWithBackends {
         DataTypeUtil.setDTypeForContext(this.initialType);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSerializationFullArrayNd4jWriteRead(Nd4jBackend backend) throws Exception {
         int length = 4;
 
@@ -91,9 +90,8 @@ public class TestSerializationDoubleToFloat extends BaseNd4jTestWithBackends {
         assertTrue(Transforms.abs(arr1.sub(arr2).div(arr1)).maxNumber().doubleValue() < 0.01);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSerializationFullArrayJava(Nd4jBackend backend) throws Exception {
         int length = 100;
         Nd4j.create(1);
@@ -123,9 +121,8 @@ public class TestSerializationDoubleToFloat extends BaseNd4jTestWithBackends {
         assertTrue(Transforms.abs(arr1.sub(arr2).div(arr1)).maxNumber().doubleValue() < 0.01);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSerializationOnViewsNd4jWriteRead(Nd4jBackend backend) throws Exception {
         int length = 100;
         Nd4j.create(1);
@@ -155,9 +152,8 @@ public class TestSerializationDoubleToFloat extends BaseNd4jTestWithBackends {
         assertTrue(Transforms.abs(sub1.sub(arr2).div(sub1)).maxNumber().doubleValue() < 0.01);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSerializationOnViewsJava(Nd4jBackend backend) throws Exception {
         int length = 100;
         Nd4j.create(1);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestSerializationFloatToDouble.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestSerializationFloatToDouble.java
index d45b44374..3ddb27acd 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestSerializationFloatToDouble.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/ndarray/TestSerializationFloatToDouble.java
@@ -49,9 +49,8 @@ public class TestSerializationFloatToDouble extends BaseNd4jTestWithBackends {
         Nd4j.setDataType(this.initialType);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSerializationFullArrayNd4jWriteRead(Nd4jBackend backend) throws Exception {
         int length = 100;
 
@@ -84,9 +83,8 @@ public class TestSerializationFloatToDouble extends BaseNd4jTestWithBackends {
         assertTrue(Transforms.abs(arr1.sub(arr2).div(arr1)).maxNumber().doubleValue() < 0.01);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSerializationFullArrayJava() throws Exception {
         int length = 100;
         Nd4j.create(1);
@@ -117,9 +115,8 @@ public class TestSerializationFloatToDouble extends BaseNd4jTestWithBackends {
         assertTrue(Transforms.abs(arr1.sub(arr2).div(arr1)).maxNumber().doubleValue() < 0.01);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSerializationOnViewsNd4jWriteRead() throws Exception {
         int length = 100;
         Nd4j.create(1);
@@ -149,9 +146,8 @@ public class TestSerializationFloatToDouble extends BaseNd4jTestWithBackends {
         assertTrue(Transforms.abs(sub1.sub(arr2).div(sub1)).maxNumber().doubleValue() < 0.01);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSerializationOnViewsJava() throws Exception {
         int length = 100;
         Nd4j.create(1);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/rng/RngTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/rng/RngTests.java
index 5e257c896..3d983117e 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/rng/RngTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/rng/RngTests.java
@@ -37,9 +37,8 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class RngTests extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRngConstitency(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(123);
         INDArray arr = Nd4j.rand(1, 5);
@@ -48,9 +47,8 @@ public class RngTests extends BaseNd4jTestWithBackends {
         assertEquals(arr, arr2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRandomWithOrder(Nd4jBackend backend) {
 
         Nd4j.getRandom().setSeed(12345);
@@ -106,9 +104,8 @@ public class RngTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRandomBinomial(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
         //silly tests. Just increasing the usage for randomBinomial to stop compiler warnings.
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/string/TestFormatting.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/string/TestFormatting.java
index cb913838d..25a0390d7 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/string/TestFormatting.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/string/TestFormatting.java
@@ -21,7 +21,7 @@
 package org.nd4j.linalg.api.string;
 
 import lombok.extern.slf4j.Slf4j;
-import org.junit.Assert;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -32,6 +32,9 @@ import org.nd4j.linalg.factory.Nd4j;
 import org.nd4j.linalg.factory.Nd4jBackend;
 import org.nd4j.linalg.string.NDArrayStrings;
 
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 /**
  * @author Adam Gibson
  */
@@ -40,18 +43,16 @@ import org.nd4j.linalg.string.NDArrayStrings;
 public class TestFormatting extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTwoByTwo(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(2, 2, 2, 2);
         System.out.println(new NDArrayStrings().format(arr));
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNd4jArrayString(Nd4jBackend backend) {
 
         INDArray arr = Nd4j.create(new float[]{1f, 20000000f, 40.838383f, 3f}, new int[]{2, 2});
@@ -59,22 +60,21 @@ public class TestFormatting extends BaseNd4jTestWithBackends {
         String serializedData1 = new NDArrayStrings(",", 3).format(arr);
         log.info("\n" + serializedData1);
         String expected1 = "[[1.000,40.838],\n" + " [2e7,3.000]]";
-        Assert.assertEquals(expected1.replaceAll(" ", ""), serializedData1.replaceAll(" ", ""));
+        assertEquals(expected1.replaceAll(" ", ""), serializedData1.replaceAll(" ", ""));
 
         String serializedData2 = new NDArrayStrings().format(arr);
         log.info("\n" + serializedData2);
         String expected2 = "[[1.0000,40.8384],\n" + " [2e7,3.0000]]";
-        Assert.assertEquals(expected2.replaceAll(" ", ""), serializedData2.replaceAll(" ", ""));
+        assertEquals(expected2.replaceAll(" ", ""), serializedData2.replaceAll(" ", ""));
 
         String serializedData3 = new NDArrayStrings(",", "000.00##E0").format(arr);
         String expected3 = "[[100.00E-2,408.3838E-1],\n" + " [200.00E5,300.00E-2]]";
         log.info("\n"+serializedData3);
-        Assert.assertEquals(expected3.replaceAll(" ", ""), serializedData3.replaceAll(" ", ""));
+        assertEquals(expected3.replaceAll(" ", ""), serializedData3.replaceAll(" ", ""));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRange(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new double[][]{
                 {-1,0,1,0},
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/tad/TestTensorAlongDimension.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/tad/TestTensorAlongDimension.java
index 9ba6b4cad..32056619c 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/tad/TestTensorAlongDimension.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/tad/TestTensorAlongDimension.java
@@ -46,9 +46,8 @@ public class TestTensorAlongDimension extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testJavaVsNative(Nd4jBackend backend) {
         long totalJavaTime = 0;
         long totalCTime = 0;
@@ -72,9 +71,8 @@ public class TestTensorAlongDimension extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTadShapesEdgeCases(Nd4jBackend backend) {
         INDArray row = Nd4j.create(DataType.DOUBLE, 1, 5);
         INDArray col = Nd4j.create(DataType.DOUBLE, 5, 1);
@@ -83,9 +81,8 @@ public class TestTensorAlongDimension extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[] {1, 5}, col.tensorAlongDimension(0, 0).shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTadShapes1d(Nd4jBackend backend) {
         //Ensure TAD returns the correct/expected shapes, and values don't depend on underlying array layout/order etc
         /**
@@ -154,9 +151,8 @@ public class TestTensorAlongDimension extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTadShapes2d(Nd4jBackend backend) {
         //Ensure TAD returns the correct/expected shapes, and values don't depend on underlying array layout/order etc
 
@@ -260,9 +256,8 @@ public class TestTensorAlongDimension extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTadKnownValues(Nd4jBackend backend) {
         long[] shape = {2, 3, 4};
 
@@ -302,9 +297,8 @@ public class TestTensorAlongDimension extends BaseNd4jTestWithBackends {
         assertEquals(exp12_1, arr.tensorAlongDimension(1, 2, 1));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStalled(Nd4jBackend backend) {
         int shape[] = new int[] {3, 3, 4, 5};
         INDArray orig2 = Nd4j.create(shape, 'c');
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/blas/BlasTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/blas/BlasTests.java
index 23a1a93cb..25ebdbf8b 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/blas/BlasTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/blas/BlasTests.java
@@ -44,9 +44,8 @@ import static org.junit.jupiter.api.Assertions.*;
 public class BlasTests extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void simpleTest(Nd4jBackend backend) {
         INDArray m1 = Nd4j.create(new double[][]{{1.0}, {2.0}, {3.0}, {4.0}});
 
@@ -76,9 +75,8 @@ public class BlasTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemmInvalid1(Nd4jBackend backend) {
         final INDArray a = Nd4j.rand(3, 4);
         final INDArray b = Nd4j.rand(4, 5);
@@ -94,9 +92,8 @@ public class BlasTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemmInvalid3(Nd4jBackend backend) {
         final INDArray a = Nd4j.rand(4, 3);
         final INDArray b = Nd4j.rand(4, 5);
@@ -112,9 +109,8 @@ public class BlasTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemm1(Nd4jBackend backend) {
         final INDArray a = Nd4j.rand(4, 3);
         final INDArray b = Nd4j.rand(4, 5);
@@ -125,9 +121,8 @@ public class BlasTests extends BaseNd4jTestWithBackends {
         assertEquals(result, result2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemm2(Nd4jBackend backend) {
         final INDArray a = Nd4j.rand(4, 3);
         final INDArray b = Nd4j.rand(4, 5);
@@ -142,9 +137,8 @@ public class BlasTests extends BaseNd4jTestWithBackends {
         assertEquals(result, view);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGemm3(Nd4jBackend backend) {
         final INDArray a = Nd4j.rand(4, 3);
         final INDArray b = Nd4j.rand(4, 5);
@@ -160,9 +154,8 @@ public class BlasTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmuli1(Nd4jBackend backend) {
         final INDArray activations = Nd4j.createUninitialized(new long[]{1, 3, 1}, 'f');
         final INDArray z = activations.tensorAlongDimension(0, 1, 2);
@@ -176,9 +169,8 @@ public class BlasTests extends BaseNd4jTestWithBackends {
         assertEquals(ab, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmuli2(Nd4jBackend backend) {
         final INDArray activations = Nd4j.createUninitialized(new long[]{2, 3, 1}, 'f');
         final INDArray z = activations.tensorAlongDimension(0, 1, 2);
@@ -192,9 +184,8 @@ public class BlasTests extends BaseNd4jTestWithBackends {
         assertEquals(ab, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmuli3(Nd4jBackend backend){
         final INDArray activations = Nd4j.createUninitialized(new long[]{1, 3, 2}, 'f');
         final INDArray z = activations.tensorAlongDimension(0, 1, 2);
@@ -207,9 +198,8 @@ public class BlasTests extends BaseNd4jTestWithBackends {
         assertEquals(ab, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test_Fp16_Mmuli_1(Nd4jBackend backend){
         final INDArray activations = Nd4j.createUninitialized(DataType.HALF, new long[]{1, 3, 2}, 'f');
         final INDArray z = activations.tensorAlongDimension(0, 1, 2);
@@ -222,9 +212,8 @@ public class BlasTests extends BaseNd4jTestWithBackends {
         assertEquals(ab, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test_Fp16_Mmuli_2(Nd4jBackend backend){
         val a = Nd4j.create(DataType.HALF, 32, 768);
         val b = Nd4j.create(DataType.HALF, 768);
@@ -235,7 +224,7 @@ public class BlasTests extends BaseNd4jTestWithBackends {
     @Test
     @Disabled
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testHalfPrecision(Nd4jBackend backend) {
         val a = Nd4j.create(DataType.HALF, 64, 768);
         val b = Nd4j.create(DataType.HALF, 768, 1024);
@@ -255,9 +244,8 @@ public class BlasTests extends BaseNd4jTestWithBackends {
         log.info("Median time: {} ms", durations.get(durations.size() / 2));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmuli4(Nd4jBackend backend){
         try {
             Nd4j.rand(1, 3).mmuli(Nd4j.rand(3, 1), Nd4j.createUninitialized(new int[]{10, 10, 1}));
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/broadcast/BasicBroadcastTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/broadcast/BasicBroadcastTests.java
index 911a1f31b..22f17f103 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/broadcast/BasicBroadcastTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/broadcast/BasicBroadcastTests.java
@@ -44,9 +44,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void basicBroadcastTest_1(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.FLOAT, 3, 5);
         val y = Nd4j.createFromArray(new float[]{1.f, 1.f, 1.f, 1.f, 1.f});
@@ -60,9 +59,8 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
         assertEquals(e, x);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void basicBroadcastTest_2(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.FLOAT, 3, 1, 2);
         val y = Nd4j.createFromArray(new float[]{1.f, 1.f, 1.f, 1.f}).reshape(2, 2);
@@ -77,9 +75,8 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void basicBroadcastTest_3(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.FLOAT, 3, 1, 2).assign(1);
         val y = Nd4j.createFromArray(new float[]{2.f, 2.f, 2.f, 2.f}).reshape(2, 2);
@@ -90,9 +87,8 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
         assertEquals(e, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void basicBroadcastTest_4(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.FLOAT, 3, 1, 2).assign(4.f);
         val y = Nd4j.createFromArray(new float[]{2.f, 2.f, 2.f, 2.f}).reshape(2, 2);
@@ -103,9 +99,8 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
         assertEquals(e, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void basicBroadcastTest_5(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.FLOAT, 3, 1, 2).assign(4.f);
         val y = Nd4j.createFromArray(new float[]{2.f, 2.f, 2.f, 2.f}).reshape(2, 2);
@@ -116,9 +111,8 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
         assertEquals(e, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void basicBroadcastTest_6(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.FLOAT, 3, 1, 2).assign(4.f);
         val y = Nd4j.createFromArray(new float[]{2.f, 2.f, 2.f, 2.f}).reshape(2, 2);
@@ -129,9 +123,8 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
         assertEquals(e, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void basicBroadcastTest_7(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.FLOAT, 3, 1, 2).assign(4.f);
         val y = Nd4j.createFromArray(new float[]{2.f, 2.f, 2.f, 2.f}).reshape(2, 2);
@@ -144,7 +137,7 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void basicBroadcastFailureTest_1(Nd4jBackend backend) {
         assertThrows(IllegalStateException.class,() -> {
             val x = Nd4j.create(DataType.FLOAT, 3, 1, 2).assign(4.f);
@@ -155,7 +148,7 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void basicBroadcastFailureTest_2(Nd4jBackend backend) {
         assertThrows(IllegalStateException.class,() -> {
             val x = Nd4j.create(DataType.FLOAT, 3, 1, 2).assign(4.f);
@@ -167,7 +160,7 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void basicBroadcastFailureTest_3(Nd4jBackend backend) {
         assertThrows(IllegalStateException.class, () -> {
             val x = Nd4j.create(DataType.FLOAT, 3, 1, 2).assign(4.f);
@@ -179,7 +172,7 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void basicBroadcastFailureTest_4(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.FLOAT, 3, 1, 2).assign(4.f);
         val y = Nd4j.createFromArray(new float[]{2.f, 2.f, 2.f, 2.f}).reshape(2, 2);
@@ -188,7 +181,7 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void basicBroadcastFailureTest_5(Nd4jBackend backend) {
         assertThrows(IllegalStateException.class,() -> {
             val x = Nd4j.create(DataType.FLOAT, 3, 1, 2).assign(4.f);
@@ -200,7 +193,7 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void basicBroadcastFailureTest_6(Nd4jBackend backend) {
         assertThrows(IllegalStateException.class,() -> {
             val x = Nd4j.create(DataType.FLOAT, 3, 1, 2).assign(4.f);
@@ -210,9 +203,8 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void basicBroadcastTest_8(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.FLOAT, 3, 1, 2).assign(4.f);
         val y = Nd4j.createFromArray(new float[]{2.f, 2.f, 2.f, 2.f}).reshape(2, 2);
@@ -223,9 +215,8 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
         assertEquals(e, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void basicBroadcastTest_9(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.FLOAT, 3, 1, 2).assign(2.f);
         val y = Nd4j.createFromArray(new float[]{2.f, 2.f, 2.f, 2.f}).reshape(2, 2);
@@ -236,9 +227,8 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
         assertEquals(e, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void basicBroadcastTest_10(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.FLOAT, 3, 1, 2).assign(1.f);
         val y = Nd4j.createFromArray(new float[]{2.f, 2.f, 2.f, 2.f}).reshape(2, 2);
@@ -249,9 +239,8 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
         assertEquals(e, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void emptyBroadcastTest_1(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.FLOAT, 1, 2);
         val y = Nd4j.create(DataType.FLOAT, 0, 2);
@@ -262,7 +251,7 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void emptyBroadcastTest_2(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.FLOAT, 1, 2);
         val y = Nd4j.create(DataType.FLOAT, 0, 2);
@@ -272,9 +261,8 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void emptyBroadcastTest_3(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.FLOAT, 1, 0, 1);
         val y = Nd4j.create(DataType.FLOAT, 1, 0, 2);
@@ -286,9 +274,8 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testValidInvalidBroadcast(Nd4jBackend backend){
         INDArray x = Nd4j.rand(3,1);
         INDArray y = Nd4j.create(3, 4);
@@ -348,9 +335,8 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLt(Nd4jBackend backend){
         INDArray x = Nd4j.scalar(0);
         INDArray y = Nd4j.createFromArray(2,1,2);
@@ -362,9 +348,8 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, lt);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAdd(Nd4jBackend backend){
         INDArray x = Nd4j.scalar(0);
         INDArray y = Nd4j.createFromArray(2,1,2);
@@ -376,9 +361,8 @@ public class BasicBroadcastTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, sum);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcatableBool_1(Nd4jBackend backend) {
         val op = DynamicCustomOp.builder("greater_equal")
                 .addInputs(Nd4j.create(DataType.FLOAT, 3), Nd4j.create(DataType.FLOAT, 3))
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/compression/CompressionMagicTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/compression/CompressionMagicTests.java
index a625425c5..1f1ccd430 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/compression/CompressionMagicTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/compression/CompressionMagicTests.java
@@ -41,9 +41,8 @@ public class CompressionMagicTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMagicDecompression1(Nd4jBackend backend) {
         INDArray array = Nd4j.linspace(1, 100, 2500, DataType.FLOAT);
 
@@ -56,9 +55,8 @@ public class CompressionMagicTests extends BaseNd4jTestWithBackends {
         assertEquals(array, compressed);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMagicDecompression4(Nd4jBackend backend) {
         INDArray array = Nd4j.linspace(1, 100, 2500, DataType.FLOAT);
 
@@ -72,9 +70,8 @@ public class CompressionMagicTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDupSkipDecompression1(Nd4jBackend backend) {
         INDArray array = Nd4j.linspace(1, 100, 2500, DataType.FLOAT);
 
@@ -90,9 +87,8 @@ public class CompressionMagicTests extends BaseNd4jTestWithBackends {
         assertEquals(array, newArray);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDupSkipDecompression2(Nd4jBackend backend) {
         INDArray array = Nd4j.linspace(1, 100, 2500, DataType.FLOAT);
 
@@ -108,9 +104,8 @@ public class CompressionMagicTests extends BaseNd4jTestWithBackends {
         assertEquals(array, newArray);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDupSkipDecompression3(Nd4jBackend backend) {
         INDArray array = Nd4j.linspace(1, 100, 2500, DataType.FLOAT);
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/compression/CompressionPerformanceTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/compression/CompressionPerformanceTests.java
index 6eb0e9dc5..da305c617 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/compression/CompressionPerformanceTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/compression/CompressionPerformanceTests.java
@@ -43,9 +43,8 @@ public class CompressionPerformanceTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void groundTruthTests_Threshold_1(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(119);
         val params = Nd4j.rand(new long[]{1, 50000000}, -1.0, 1.0, Nd4j.getRandom());
@@ -87,9 +86,8 @@ public class CompressionPerformanceTests extends BaseNd4jTestWithBackends {
         log.info("Encoding time: {} ms; Serialization time: {} ms; Deserialized time: {} ms; Serialized bytes: {}", timeE / iterations, timeS / iterations, timeD / iterations, s);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void groundTruthTests_Bitmap_1(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(119);
         val params = Nd4j.rand(new long[]{1, 25000000}, -1.0, 1.0, Nd4j.getRandom());
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/compression/CompressionSerDeTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/compression/CompressionSerDeTests.java
index f495cbfee..42381483d 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/compression/CompressionSerDeTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/compression/CompressionSerDeTests.java
@@ -39,9 +39,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class CompressionSerDeTests extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAutoDecompression2(Nd4jBackend backend) throws Exception {
         INDArray array = Nd4j.linspace(1, 10, 11, DataType.DOUBLE);
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/compression/CompressionTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/compression/CompressionTests.java
index 754bbe985..9809a7552 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/compression/CompressionTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/compression/CompressionTests.java
@@ -43,7 +43,7 @@ import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
-import static junit.framework.TestCase.assertFalse;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 @Slf4j
@@ -52,9 +52,8 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCompressionDescriptorSerde(Nd4jBackend backend) {
         CompressionDescriptor descriptor = new CompressionDescriptor();
         descriptor.setCompressedLength(4);
@@ -69,9 +68,8 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
         assertEquals(descriptor, fromByteBuffer);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGzipInPlaceCompression(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new float[] {1f, 2f, 3f, 4f, 5f});
         Nd4j.getCompressor().setDefaultCompression("GZIP");
@@ -81,9 +79,8 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
         assertFalse(array.isCompressed());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGzipCompression1(Nd4jBackend backend) {
         INDArray array = Nd4j.linspace(1, 10000, 20000, DataType.FLOAT);
         INDArray exp = array.dup();
@@ -100,9 +97,8 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, decomp);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNoOpCompression1(Nd4jBackend backend) {
         Nd4j.setDefaultDataTypes(DataType.FLOAT, DataType.FLOAT);
         INDArray array = Nd4j.linspace(1, 10000, 20000, DataType.FLOAT);
@@ -128,9 +124,8 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, decomp);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testJVMCompression3(Nd4jBackend backend) {
         Nd4j.setDefaultDataTypes(DataType.FLOAT, DataType.FLOAT);
         INDArray exp = Nd4j.create(new float[] {1f, 2f, 3f, 4f, 5f}).reshape(1,-1);
@@ -149,9 +144,8 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
 
 
     @Disabled
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testThresholdCompression0(Nd4jBackend backend) {
         INDArray initial = Nd4j.rand(new int[] {1, 150000000}, 119L);
 
@@ -184,7 +178,7 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
     @Test
     @Disabled
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testThresholdCompression1(Nd4jBackend backend) {
         INDArray initial = Nd4j.create(new float[] {0.0f, 0.0f, 1e-3f, -1e-3f, 0.0f, 0.0f});
         INDArray exp_0 = Nd4j.create(DataType.FLOAT, 6);
@@ -203,9 +197,8 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
         assertEquals(exp_0, initial);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testThresholdCompression2(Nd4jBackend backend) {
         INDArray initial = Nd4j.create(new double[] {1.0, 2.0, 0.0, 0.0, -1.0, -1.0});
         INDArray exp_0 = Nd4j.create(new double[] {1.0 - 1e-3, 2.0 - 1e-3, 0.0, 0.0, -1.0 + 1e-3, -1.0 + 1e-3});
@@ -227,9 +220,8 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
         assertEquals(exp_1, decompressed);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testThresholdCompression3(Nd4jBackend backend) {
         INDArray initial = Nd4j.create(new double[] {-1.0, -2.0, 0.0, 0.0, 1.0, 1.0});
         INDArray exp_0 = Nd4j.create(new double[] {-1.0 + 1e-3, -2.0 + 1e-3, 0.0, 0.0, 1.0 - 1e-3, 1.0 - 1e-3});
@@ -258,9 +250,8 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
         assertEquals(decompressed, decompressed_copy);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testThresholdCompression4(Nd4jBackend backend) {
         INDArray initial = Nd4j.create(new double[] {1e-4, -1e-4, 0.0, 0.0, 1e-4, -1e-4});
         INDArray exp_0 = initial.dup();
@@ -278,9 +269,8 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testThresholdCompression5(Nd4jBackend backend) {
         INDArray initial = Nd4j.ones(10);
         INDArray exp_0 = initial.dup();
@@ -297,9 +287,8 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
         assertEquals(7, initial.sumNumber().doubleValue(), 0.01);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testThresholdCompression5_1(Nd4jBackend backend) {
         INDArray initial = Nd4j.ones(1000);
         INDArray exp_0 = initial.dup();
@@ -316,9 +305,8 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
         assertEquals(900, initial.sumNumber().doubleValue(), 0.01);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testThresholdCompression6(Nd4jBackend backend) {
         INDArray initial = Nd4j.create(new double[] {1.0, 2.0, 0.0, 0.0, -1.0, -1.0});
         INDArray exp_0 = Nd4j.create(new double[] {1.0 - 1e-3, 2.0 - 1e-3, 0.0, 0.0, -1.0 + 1e-3, -1.0 + 1e-3});
@@ -347,9 +335,8 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testThresholdSerialization1(Nd4jBackend backend) throws Exception {
         INDArray initial = Nd4j.create(new double[] {-1.0, -2.0, 0.0, 0.0, 1.0, 1.0});
         INDArray exp_0 = Nd4j.create(new double[] {-1.0 + 1e-3, -2.0 + 1e-3, 0.0, 0.0, 1.0 - 1e-3, 1.0 - 1e-3});
@@ -371,9 +358,8 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
         assertEquals(exp_1, decompressed_copy);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBitmapEncoding1(Nd4jBackend backend) {
         INDArray initial = Nd4j.create(new float[] {0.0f, 0.0f, 1e-3f, -1e-3f, 0.0f, 0.0f});
         INDArray exp_0 = Nd4j.create(DataType.FLOAT, 6);
@@ -395,9 +381,8 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
         assertEquals(exp_1, target);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBitmapEncoding1_1(Nd4jBackend backend) {
         INDArray initial = Nd4j.create(15);
         INDArray exp_0 = Nd4j.create(6);
@@ -421,9 +406,8 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
         assertEquals(7, enc.data().length());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBitmapEncoding2(Nd4jBackend backend) {
         INDArray initial = Nd4j.create(40000000);
         INDArray target = Nd4j.create(initial.length());
@@ -443,9 +427,8 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBitmapEncoding3(Nd4jBackend backend) {
         Nd4j.setDefaultDataTypes(DataType.FLOAT, DataType.FLOAT);
         INDArray initial = Nd4j.create(new float[] {0.0f, -6e-4f, 1e-3f, -1e-3f, 0.0f, 0.0f});
@@ -472,9 +455,8 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBitmapEncoding4(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(119);
         INDArray initial = Nd4j.rand(new int[]{1, 10000}, 0, 1, Nd4j.getRandom());
@@ -487,9 +469,8 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
         assertEquals(exp_1, initial);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBitmapEncoding5(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(119);
         INDArray initial = Nd4j.rand(new int[]{10000}, -1, -0.5, Nd4j.getRandom());
@@ -504,9 +485,8 @@ public class CompressionTests extends BaseNd4jTestWithBackends {
         assertEquals(exp_1, initial);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBitmapEncoding6(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(119);
         INDArray initial = Nd4j.rand(new int[]{10000}, -1, 1, Nd4j.getRandom());
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/ConvolutionTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/ConvolutionTests.java
index 4491f485b..c3c8284e6 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/ConvolutionTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/ConvolutionTests.java
@@ -52,9 +52,8 @@ import static org.nd4j.linalg.indexing.NDArrayIndex.point;
 
 public class ConvolutionTests extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIm2ColKnownValues(Nd4jBackend backend) {
         //Input: w=3, h=3, depth=2, minibatch = 2
         //kH=2, kW=2
@@ -193,9 +192,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIm2ColKnownValuesDilated(Nd4jBackend backend) {
         //Input: w=4, h=4, depth=1, minibatch = 2, dilation=2, stride 1
         //kH=2, kW=2
@@ -308,9 +306,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
         assertEquals(expected, out3p);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIm2ColKnownValuesDilatedStrided(Nd4jBackend backend) {
         //Input: w=5, h=5, depth=1, minibatch = 1, dilation=2, stride 2
         //kH=2, kW=2
@@ -392,9 +389,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
         assertEquals(expected, out3p);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIm2ColKnownValuesMiniBatch3(Nd4jBackend backend) {
         //Input: w=3, h=3, depth=2, minibatch = 3
         //kH=2, kW=2
@@ -580,9 +576,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIm2ColSamePadding(Nd4jBackend backend) {
         //Input: w=3, h=3, depth=2, minibatch = 2, kH/kW = 2, stride=1
 
@@ -841,9 +836,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIm2ColSamePaddingStride2(Nd4jBackend backend) {
         //Input: h=3, w=4, depth=2, minibatch = 1, kH/kW = 3, stride=2
 
@@ -996,9 +990,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCol2ImSamePaddingStride2(Nd4jBackend backend) {
         //Input: h=3, w=4, depth=2, minibatch = 1, kH/kW = 3, stride=2
 
@@ -1127,9 +1120,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCol2ImSamePaddingStride1Dilation2(Nd4jBackend backend) {
         //Input: h=4, w=5, depth=1, minibatch = 1, kH/kW = 2, stride=1, dilation 2
 
@@ -1316,17 +1308,15 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConvOutWidthAndHeight(Nd4jBackend backend) {
         long outSize = Convolution.outSize(2, 1, 1, 2, 1, false);
         assertEquals(6, outSize);
     }
 /*
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIm2Col(Nd4jBackend backend) {
         INDArray linspaced = Nd4j.linspace(1, 16, 16, DataType.FLOAT).reshape(2, 2, 2, 2);
         INDArray ret = Convolution.im2col(linspaced, 1, 1, 1, 1, 2, 2, 0, false);
@@ -1501,9 +1491,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCol2Im(Nd4jBackend backend) {
         int kh = 1;
         int kw = 1;
@@ -1522,9 +1511,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testimcolim(Nd4jBackend backend) {
         int nEx = 2;
         int depth = 3;
@@ -1546,9 +1534,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
         assertEquals(assertcol2im, col2im);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIm2ColWithDilation(Nd4jBackend backend) {
         int kH = 2;
         int kW = 2;
@@ -1592,9 +1579,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPoolingEdgeCases(){
         //Average pooling with same mode: should we include the padded values, when deciding what to divide by?
         ///*** Note: Mode 2 is the "DL4J always divide by kH*kW" approach ***
@@ -1678,9 +1664,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPooling1(Nd4jBackend backend) {
         for( char outputOrder : new char[]{'c', 'f'}) {
             INDArray exp = Nd4j.create(new float[]{6.f, 7.f, 10.f, 11.f, 22.f, 23.f, 26.f, 27.f, 38.f, 39.f, 42.f, 43.f, 54.f, 55.f, 58.f, 59.f}, new int[]{2, 2, 2, 2}, 'c');
@@ -1742,9 +1727,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPooling2(Nd4jBackend backend) {
         for( char outputOrder : new char[]{'c', 'f'}) {
             INDArray exp = Nd4j.create(new float[]{6.f, 7.f,  10.f,  11.f,  22.f,  23.f,  26.f,  27.f,  38.f,  39.f,  42.f,  43.f,  54.f,  55.f,  58.f, 59.f}, new int[]{2, 2, 2, 2}, 'c');
@@ -1766,9 +1750,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPooling3(Nd4jBackend backend) {
         for( char outputOrder : new char[]{'c', 'f'}) {
             INDArray exp = Nd4j.create(new float[]{11.f,  12.f,  15.f,  16.f,  27.f,  28.f,  31.f,  32.f,  43.f,  44.f,  47.f,  48.f,  59.f,  60.f,  63.f, 64.f}, new int[]{2, 2, 2, 2}, 'c');
@@ -1791,9 +1774,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPooling4(Nd4jBackend backend) {
         for( char outputOrder : new char[]{'c', 'f'}) {
             INDArray exp = Nd4j.create(new float[]{11.f,  12.f,  15.f,  16.f,  27.f,  28.f,  31.f,  32.f,  43.f,  44.f,  47.f,  48.f,  59.f,  60.f,  63.f, 64.f}, new int[]{2, 2, 2, 2}, 'c');
@@ -1816,9 +1798,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPooling5(Nd4jBackend backend) {
         for( char outputOrder : new char[]{'c', 'f'}) {
             INDArray exp = Nd4j.create(new float[]{7.f,    8.f,   11.f,   12.f,   14.f,   15.f,   27.f,   28.f,   31.f,   32.f,   34.f,   35.f, 42.f,   43.f,   46.f,   47.f,   49.f,   50.f,   57.f,   58.f,   61.f,   62.f,   64.f,   65.f, 77.f,   78.f,   81.f,   82.f,   84.f,   85.f,   92.f,   93.f,   96.f,   97.f,   99.f,  100.f}, new int[]{2, 3, 3, 2}, 'c');
@@ -1841,9 +1822,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPooling6(Nd4jBackend backend) {
         for( char outputOrder : new char[]{'c', 'f'}) {
             INDArray exp = Nd4j.create(new float[]{7.f,   8.f,  11.f,  12.f,  27.f,  28.f,  31.f,  32.f,  57.f,  58.f,  61.f,  62.f,  77.f,  78.f,  81.f, 82.f}, new int[]{2, 2, 2, 2}, 'c');
@@ -1866,9 +1846,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPooling7(Nd4jBackend backend) {
         for( char outputOrder : new char[]{'c', 'f'}) {
             INDArray exp = Nd4j.create(new float[]{7.f, 9.f, 17.f, 19.f, 32.f, 34.f, 42.f, 44.f, 57.f, 59.f, 67.f, 69.f, 82.f, 84.f, 92.f, 94.f}, new int[]{2, 2, 2, 2}, 'c');
@@ -1890,9 +1869,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPooling8(Nd4jBackend backend) {
         for( char outputOrder : new char[]{'c', 'f'}) {
             INDArray exp = Nd4j.create(new float[]{1.f, 2.5f, 4.5f, 8.5f, 10.f, 12.f, 18.5f, 20.f, 22.f, 26.f, 27.5f, 29.5f, 33.5f, 35.f, 37.f, 43.5f, 45.f, 47.f,  51.f, 52.5f, 54.5f,  58.5f, 60.f, 62.f, 68.5f, 70.f, 72.f,  76.f, 77.5f, 79.5f, 83.5f, 85.f, 87.f,  93.5f, 95.f, 97.f}, new int[]{2, 2, 3, 3}, 'c');
@@ -1914,9 +1892,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPooling9(Nd4jBackend backend) {
         for( char outputOrder : new char[]{'c', 'f'}) {
             INDArray exp = Nd4j.create(new float[]{0.25f, 1.25f, 2.25f,  4.25f, 10.f, 12.f, 9.25f, 20.f, 22.f, 6.5f, 13.75f, 14.75f, 16.75f, 35.f, 37.f,  21.75f, 45.f, 47.f,  12.75f, 26.25f, 27.25f,  29.25f, 60.f, 62.f, 34.25f, 70.f, 72.f, 19.f, 38.75f, 39.75f, 41.75f, 85.f, 87.f, 46.75f, 95.f, 97.f}, new int[]{2, 2, 3, 3}, 'c');
@@ -1938,9 +1915,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPooling10(Nd4jBackend backend) {
         for( char outputOrder : new char[]{'c', 'f'}) {
             INDArray exp = Nd4j.create(new float[]{4.f, 6.f, 7.5f, 14.f, 16.f, 17.5f,  21.5f, 23.5f, 25.f, 29.f, 31.f, 32.5f, 39.f, 41.f, 42.5f, 46.5f, 48.5f, 50.f, 54.f, 56.f, 57.5f,  64.f, 66.f, 67.5f, 71.5f, 73.5f, 75.f, 79.f, 81.f, 82.5f, 89.f, 91.f, 92.5f,  96.5f, 98.5f, 100.f}, new int[]{2, 2, 3, 3}, 'c');
@@ -1962,9 +1938,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPooling11(Nd4jBackend backend) {
         for( char outputOrder : new char[]{'c', 'f'}) {
             INDArray exp = Nd4j.create(new float[]{3, 4, 6, 7}, new int[]{1, 1, 2, 2}, 'c');
@@ -1986,9 +1961,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPooling12(Nd4jBackend backend) {
         for( char outputOrder : new char[]{'c', 'f'}) {
             INDArray exp = Nd4j.create(new float[]{3.f, 4.f, 4.5f, 6.f, 7.f, 7.5f, 7.5f, 8.5f, 9.f}, new int[]{1, 1, 3, 3}, 'c');
@@ -2011,9 +1985,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPooling13(Nd4jBackend backend) {
         for( char outputOrder : new char[]{'c'}) {
             INDArray exp = Nd4j.create(new float[]{3.f, 4.f, 4.5f, 6.f, 7.f, 7.5f, 7.5f, 8.5f, 9.f}, new int[]{1, 1, 3, 3}, 'c');
@@ -2037,9 +2010,8 @@ public class ConvolutionTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPoolingDilation(){
 
         int[] inputShape = {1, 1, 4, 5};
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/ConvolutionTestsC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/ConvolutionTestsC.java
index 4278849e4..fe09f0555 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/ConvolutionTestsC.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/ConvolutionTestsC.java
@@ -52,17 +52,15 @@ public class ConvolutionTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConvOutWidthAndHeight(Nd4jBackend backend) {
         long outSize = Convolution.outSize(2, 1, 1, 2, 1, false);
         assertEquals(6, outSize);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIm2Col(Nd4jBackend backend) {
         INDArray linspaced = Nd4j.linspace(1, 16, 16, DataType.DOUBLE).reshape(2, 2, 2, 2);
         INDArray ret = Convolution.im2col(linspaced, 1, 1, 1, 1, 2, 2, 0, false);
@@ -86,9 +84,8 @@ public class ConvolutionTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIm2Col2(Nd4jBackend backend) {
         int kh = 2;
         int kw = 2;
@@ -112,7 +109,7 @@ public class ConvolutionTestsC extends BaseNd4jTestWithBackends {
     @Test
     @Disabled
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCompareIm2ColImpl(Nd4jBackend backend) {
 
         int[] miniBatches = {1, 3, 5};
@@ -193,9 +190,8 @@ public class ConvolutionTestsC extends BaseNd4jTestWithBackends {
         DataTypeUtil.setDTypeForContext(initialType);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPooling2D_Same(Nd4jBackend backend) {
         int[] miniBatches = {1, 3, 5};
         int[] depths = {1, 3, 5};
@@ -291,9 +287,8 @@ public class ConvolutionTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMoreIm2Col2(Nd4jBackend backend) {
         int kh = 2;
         int kw = 2;
@@ -315,9 +310,8 @@ public class ConvolutionTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCol2Im(Nd4jBackend backend) {
         int kh = 1;
         int kw = 1;
@@ -333,9 +327,8 @@ public class ConvolutionTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, newTest);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testimcolim(Nd4jBackend backend) {
         int nEx = 2;
         int depth = 3;
@@ -361,7 +354,7 @@ public class ConvolutionTestsC extends BaseNd4jTestWithBackends {
     @Test
     @Disabled
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMaxPoolBackprop(){
         Nd4j.getRandom().setSeed(12345);
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/DeconvTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/DeconvTests.java
index 8886d89de..e39678f4f 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/DeconvTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/convolution/DeconvTests.java
@@ -54,9 +54,8 @@ public class DeconvTests extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void compareKeras(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         File newFolder = testDir.toFile();
         new ClassPathResource("keras/deconv/").copyDirectory(newFolder);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/crash/CrashTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/crash/CrashTest.java
index 503f95fa2..ec95134a3 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/crash/CrashTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/crash/CrashTest.java
@@ -53,9 +53,8 @@ public class CrashTest extends BaseNd4jTestWithBackends {
     /**
      * tensorAlongDimension() produces shapeInfo without EWS defined
      */
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNonEWSViews1(Nd4jBackend backend) {
         log.debug("non-EWS 1");
         INDArray x = Nd4j.create(64, 1024, 64);
@@ -67,9 +66,8 @@ public class CrashTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNonEWSViews2(Nd4jBackend backend) {
         log.debug("non-EWS 2");
         INDArray x = Nd4j.create(new int[] {64, 1024, 64}, 'f');
@@ -84,9 +82,8 @@ public class CrashTest extends BaseNd4jTestWithBackends {
     /**
      * slice() produces shapeInfo with EWS being 1 in our case
      */
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEWSViews1(Nd4jBackend backend) {
         log.debug("EWS 1");
         INDArray x = Nd4j.create(64, 1024, 64);
@@ -98,9 +95,8 @@ public class CrashTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEWSViews2(Nd4jBackend backend) {
         log.debug("EWS 2");
         INDArray x = Nd4j.create(new int[] {96, 1024, 64}, 'f');
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/crash/SpecialTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/crash/SpecialTests.java
index ce09ff895..59ef09082 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/crash/SpecialTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/crash/SpecialTests.java
@@ -60,9 +60,8 @@ import static org.nd4j.linalg.indexing.NDArrayIndex.*;
 public class SpecialTests extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDimensionalThings1(Nd4jBackend backend) {
         INDArray x = Nd4j.rand(new int[] {20, 30, 50});
         INDArray y = Nd4j.rand(x.shape());
@@ -70,9 +69,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         INDArray result = transform(x, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDimensionalThings2(Nd4jBackend backend) {
         INDArray x = Nd4j.rand(new int[] {20, 30, 50});
         INDArray y = Nd4j.rand(x.shape());
@@ -118,9 +116,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarShuffle2(Nd4jBackend backend) {
         List<DataSet> listData = new ArrayList<>();
         for (int i = 0; i < 3; i++) {
@@ -133,9 +130,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         data.shuffle();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVstack2(Nd4jBackend backend) {
         INDArray matrix = Nd4j.create(10000, 100);
 
@@ -147,9 +143,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         INDArray result = Nd4j.vstack(views);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVstack1(Nd4jBackend backend) {
         INDArray matrix = Nd4j.create(10000, 100);
 
@@ -169,9 +164,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcatMulti() throws Exception {
         val shapeA = new int[] {50, 20};
         val shapeB = new int[] {50, 497};
@@ -189,9 +183,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         Thread.sleep(1000);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcatMulti2(Nd4jBackend backend) {
         Nd4j.create(1);
         val executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(2);
@@ -200,9 +193,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         });
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMigrationMultiGpu_1() throws Exception {
         if (Nd4j.getAffinityManager().getNumberOfDevices() < 2)
             return;
@@ -245,9 +237,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMigrationMultiGpu_2() throws Exception {
         if (Nd4j.getAffinityManager().getNumberOfDevices() < 2)
             return;
@@ -289,9 +280,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastLt(){
         for( int i=0; i<10; i++) {
 
@@ -303,9 +293,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastLt2(){
         for( int i=0; i<10; i++) {
             INDArray orig = Nd4j.create(DataType.DOUBLE, 1, 7, 4, 4);
@@ -318,9 +307,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void reproduceWorkspaceCrash(){
         val conf = WorkspaceConfiguration.builder().build();
 
@@ -345,9 +333,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void reproduceWorkspaceCrash_2(){
         val dtypes = new DataType[]{DataType.DOUBLE, DataType.FLOAT, DataType.HALF, DataType.LONG, DataType.INT, DataType.SHORT, DataType.BYTE, DataType.UBYTE, DataType.BOOL};
         for (val dX : dtypes) {
@@ -363,9 +350,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void reproduceWorkspaceCrash_3(){
         val conf = WorkspaceConfiguration.builder().build();
 
@@ -386,9 +372,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCastLong_1(Nd4jBackend backend) {
         val array = Nd4j.create(DataType.LONG, 100, 100).assign(1);
         val second = Nd4j.create(DataType.LONG, 100, 100).assign(1);
@@ -401,68 +386,60 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         assertEquals(array, second);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCastHalf_1(Nd4jBackend backend) {
         val array = Nd4j.create(DataType.HALF, 2, 5).assign(1);
         assertEquals(10.f, array.sumNumber().floatValue(), 1e-3);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCastHalf_2(Nd4jBackend backend) {
         val array = Nd4j.create(DataType.HALF, 2, 5).assign(1);
         assertEquals(10.f, array.sumNumber().floatValue(), 1e-3);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCastHalf_3(Nd4jBackend backend) {
         val arrayY = Nd4j.create(DataType.FLOAT, 2, 5).assign(2);
         val arrayX = Nd4j.create(DataType.HALF, 2, 5).assign(arrayY);
         assertEquals(20.f, arrayX.sumNumber().floatValue(), 1e-3);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReduce_Small_1(Nd4jBackend backend) {
         val array = Nd4j.create(DataType.SHORT, 100, 30).assign(1);
         assertEquals(3000, array.sumNumber().intValue());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReduce_Small_2(Nd4jBackend backend) {
         val array = Nd4j.create(DataType.BYTE, 100, 100).assign(0);
         assertEquals(0, array.sumNumber().intValue());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReduce3_Small_1(Nd4jBackend backend) {
         val arrayA = Nd4j.create(DataType.SHORT, 100, 100).assign(1);
         val arrayB = Nd4j.create(DataType.SHORT, 100, 100).assign(1);
         assertEquals(arrayA, arrayB);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReduce3_Small_2(Nd4jBackend backend) {
         val arrayA = Nd4j.create(DataType.BYTE, 100, 100).assign(1);
         val arrayB = Nd4j.create(DataType.BYTE, 100, 100).assign(1);
         assertEquals(arrayA, arrayB);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void reproduceWorkspaceCrash_4(){
         val conf = WorkspaceConfiguration.builder().build();
 
@@ -483,9 +460,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void reproduceWorkspaceCrash_5(){
         val conf = WorkspaceConfiguration.builder().build();
 
@@ -504,9 +480,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcatAgain(){
         INDArray[] toConcat = new INDArray[3];
         for( int i=0; i<toConcat.length; i++ ) {
@@ -517,9 +492,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
 //        System.out.println(out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcat2(){
         //Nd4j.getExecutioner().enableDebugMode(true);
         //Nd4j.getExecutioner().enableVerboseMode(true);
@@ -544,9 +518,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
 //        System.out.println(out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testYoloStyle(){
         WorkspaceConfiguration WS_ALL_LAYERS_ACT_CONFIG = WorkspaceConfiguration.builder()
                 .initialSize(0)
@@ -586,9 +559,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSpaceToBatch(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(7331);
 
@@ -608,9 +580,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         Nd4j.getExecutioner().execAndReturn(op);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBatchToSpace(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(1337);
 
@@ -630,9 +601,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         Nd4j.getExecutioner().execAndReturn(op);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testYoloS(){
         //Nd4j.getExecutioner().enableDebugMode(true);
         //Nd4j.getExecutioner().enableVerboseMode(true);
@@ -674,9 +644,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatchCondition(){
         INDArray x = Nd4j.valueArrayOf(new long[]{10,10}, 2.0, DataType.DOUBLE);
         val op = new MatchCondition(x, Conditions.equals(2));
@@ -685,9 +654,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         assertEquals(100, count);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastMul_bool(Nd4jBackend backend) {
         val mask = Nd4j.create(DataType.BOOL, 1, 3, 4, 4);
         val object = Nd4j.create(DataType.BOOL, 1, 4, 4);
@@ -696,9 +664,8 @@ public class SpecialTests extends BaseNd4jTestWithBackends {
         Nd4j.getExecutioner().commit();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReshape(){
         INDArray c = Nd4j.linspace(1,6,6, DataType.DOUBLE).reshape('c', 2,3);
         INDArray f = c.dup('f');
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/custom/CustomOpsTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/custom/CustomOpsTests.java
index 14563e43b..a6a0ab8a6 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/custom/CustomOpsTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/custom/CustomOpsTests.java
@@ -103,9 +103,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNonInplaceOp1(Nd4jBackend backend) {
         val arrayX = Nd4j.create(10, 10);
         val arrayY = Nd4j.create(10, 10);
@@ -130,9 +129,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
      * This test works inplace, but without inplace declaration
      */
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNonInplaceOp2(Nd4jBackend backend) {
         val arrayX = Nd4j.create(10, 10);
         val arrayY = Nd4j.create(10, 10);
@@ -155,7 +153,7 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     @Test
     @Disabled // it's noop, we dont care anymore
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNoOp1(Nd4jBackend backend) {
         val arrayX = Nd4j.create(10, 10);
         val arrayY = Nd4j.create(5, 3);
@@ -178,9 +176,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFloor(Nd4jBackend backend) {
         val arrayX = Nd4j.create(10, 10);
 
@@ -222,9 +219,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNoneInplaceOp3(Nd4jBackend backend) {
         val arrayX = Nd4j.create(10, 10);
         val arrayY = Nd4j.create(10, 10);
@@ -245,9 +241,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNoneInplaceOp4(Nd4jBackend backend) {
         val arrayX = Nd4j.create(DataType.INT, 10, 10);
         val arrayY = Nd4j.create(DataType.INT, 10, 10);
@@ -270,9 +265,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNoneInplaceOp5(Nd4jBackend backend) {
         if (!Nd4j.isExperimentalMode())
             return;
@@ -298,9 +292,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMergeMax1(Nd4jBackend backend) {
         val array0 = Nd4j.create(new double[] {1, 0, 0, 0, 0});
         val array1 = Nd4j.create(new double[] {0, 2, 0, 0, 0});
@@ -323,9 +316,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMergeMaxF(Nd4jBackend backend) {
 
         val array0 = Nd4j.rand('f', 5, 2).add(1); //some random array with +ve numbers
@@ -347,9 +339,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMergeMaxMixedOrder_Subtract(Nd4jBackend backend) {
         val exp = Nd4j.create(new int[] {2, 2}, 'c').assign(5.0);
         Nd4j.getExecutioner().commit();
@@ -363,9 +354,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMergeMaxSameOrder_Subtract(Nd4jBackend backend) {
         val exp = Nd4j.create(new int[] {2, 2}, 'c').assign(5.0);
         Nd4j.getExecutioner().commit();
@@ -377,9 +367,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMergeMaxMixedOrder(Nd4jBackend backend) {
         val array0 = Nd4j.rand('f', 5, 2).addi(1); //some random array with +ve numbers
         val array1 = array0.dup('c').addi(5);
@@ -402,9 +391,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOutputShapes1(Nd4jBackend backend) {
         val array0 = Nd4j.rand('f', 5, 2).addi(1); //some random array with +ve numbers
         val array1 = array0.dup().addi(5);
@@ -427,17 +415,15 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOpStatus1(Nd4jBackend backend) {
         assertEquals(OpStatus.ND4J_STATUS_OK, OpStatus.byNumber(0));
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRandomStandardNormal_1(Nd4jBackend backend) {
         if (Nd4j.getExecutioner().type() == OpExecutioner.ExecutionerType.CUDA)
             return;
@@ -454,9 +440,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRandomStandardNormal_2(Nd4jBackend backend) {
         if (Nd4j.getExecutioner().type() == OpExecutioner.ExecutionerType.CUDA)
             return;
@@ -473,9 +458,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOpContextExecution_1(Nd4jBackend backend) {
         val arrayX = Nd4j.createFromArray(new float[]{1, 2, 3, 4, 5});
         val arrayY = Nd4j.createFromArray(new float[]{1, 2, 3, 4, 5});
@@ -495,9 +479,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOpContextExecution_2(Nd4jBackend backend) {
         val arrayX = Nd4j.createFromArray(new float[]{1, 2, 3, 4, 5});
         val arrayY = Nd4j.createFromArray(new float[]{1, 2, 3, 4, 5});
@@ -518,9 +501,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOpContextExecution_3(Nd4jBackend backend) {
         val arrayX = Nd4j.create(100);
         val arrayY = Nd4j.ones(100);
@@ -542,9 +524,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFlatten_1(Nd4jBackend backend) {
         val arrayA = Nd4j.createFromArray(1.f, 2.f, 3.f);
         val arrayB = Nd4j.createFromArray(4.f, 5.f, 6.f);
@@ -558,9 +539,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatmulBp(Nd4jBackend backend) {
         val a = Nd4j.create(DataType.DOUBLE, 1,3);
         val b = Nd4j.create(DataType.DOUBLE, 1,4);
@@ -579,9 +559,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStridedSliceEdgeCase(){
         INDArray in = Nd4j.scalar(10.0).reshape(1);   //Int [1]
         INDArray begin = Nd4j.ones(DataType.INT, 1);
@@ -609,9 +588,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDepthwise(){
         INDArray input = Nd4j.create(DataType.DOUBLE, 1,3,8,8);
         INDArray depthwiseWeight = Nd4j.create(DataType.DOUBLE, 1,1,3,2);
@@ -637,9 +615,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMod_1(Nd4jBackend backend) {
         val x = Nd4j.createFromArray(5.f, 6.f, 7.f);
         val y = Nd4j.scalar(4.f);
@@ -651,9 +628,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarVector_edge_1(Nd4jBackend backend) {
         val x = Nd4j.scalar(2.0f);
         val y = Nd4j.createFromArray(new float[]{2.0f});
@@ -666,9 +642,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarVector_edge_2(Nd4jBackend backend) {
         val x = Nd4j.scalar(2.0f);
         val y = Nd4j.createFromArray(new float[]{2.0f});
@@ -701,9 +676,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUpsampling2dBackprop(){
 
         Nd4j.getRandom().setSeed(12345);
@@ -748,9 +722,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIsMaxView(){
         INDArray predictions = Nd4j.rand(DataType.FLOAT, 3, 4, 3, 2);
 
@@ -768,9 +741,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void isMax4d_2dims(){
         Nd4j.getRandom().setSeed(12345);
         INDArray in = Nd4j.rand(DataType.FLOAT, 3, 3, 4, 4).permute(0, 2, 3, 1);
@@ -785,9 +757,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSizeTypes(){
         List<DataType> failed = new ArrayList<>();
         for(DataType dt : new DataType[]{DataType.LONG, DataType.INT, DataType.SHORT, DataType.BYTE,
@@ -818,9 +789,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testListDiff(){
         INDArray x = Nd4j.createFromArray(0, 1, 2, 3);
         INDArray y = Nd4j.createFromArray(3, 1);
@@ -840,9 +810,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTopK1(){
         INDArray x = Nd4j.createFromArray(0.0, 0.0, 0.0, 10.0, 0.0);
         INDArray k = Nd4j.scalar(1);
@@ -864,9 +833,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMaxPool2Dbp_1(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.HALF, 2,3,16,16).assign(Double.NaN);
         val y = Nd4j.create(DataType.HALF, 2,3,8,8).assign(Double.NaN);
@@ -883,9 +851,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test() throws Exception {
 
         INDArray in1 = Nd4j.create(DataType.BFLOAT16, 2, 3, 10, 1);//Nd4j.createFromArray(0.2019043,0.6464844,0.9116211,0.60058594,0.34033203,0.7036133,0.6772461,0.3815918,0.87353516,0.04650879,0.67822266,0.8618164,0.88378906,0.7573242,0.66796875,0.63427734,0.33764648,0.46923828,0.62939453,0.76464844,-0.8618164,-0.94873047,-0.9902344,-0.88916016,-0.86572266,-0.92089844,-0.90722656,-0.96533203,-0.97509766,-0.4975586,-0.84814453,-0.984375,-0.98828125,-0.95458984,-0.9472656,-0.91064453,-0.80859375,-0.83496094,-0.9140625,-0.82470703,0.4802246,0.45361328,0.28125,0.28320312,0.79345703,0.44604492,-0.30273438,0.11730957,0.56396484,0.73583984,0.1418457,-0.44848633,0.6923828,-0.40234375,0.40185547,0.48632812,0.14538574,0.4638672,0.13000488,0.5058594)
@@ -905,9 +872,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAdjustContrast(Nd4jBackend backend) {
         INDArray in = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 4*4*3).reshape(4,4,3);
         INDArray out = Nd4j.zeros(DataType.DOUBLE,4, 4, 3);
@@ -924,9 +890,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAdjustContrastShape(){
         DynamicCustomOp op = DynamicCustomOp.builder("adjust_contrast_v2")
                 .addInputs(Nd4j.create(DataType.FLOAT, 256, 256,3), Nd4j.scalar(0.5f))
@@ -938,9 +903,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBitCastShape(){
         INDArray out = Nd4j.createUninitialized(1,10);
         BitCast op = new BitCast(Nd4j.zeros(1,10), DataType.FLOAT.toInt(), out);
@@ -950,9 +914,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAdjustSaturation(Nd4jBackend backend) {
         INDArray in = Nd4j.createFromArray(new double[]{50,100,78, 118.5,220,112.5,190,163.5,230, 255,128.5,134}).reshape(2,2,3);
         INDArray out = Nd4j.create(in.shape());
@@ -963,9 +926,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAdjustHue(Nd4jBackend backend) {
         INDArray in = Nd4j.createFromArray(new double[]{0,100,56, 17,220,5, 150,97,230, 255,2,13}).reshape(2,2,3);
         INDArray out = Nd4j.create(in.shape());
@@ -976,9 +938,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBitCast(Nd4jBackend backend) {
         INDArray in = Nd4j.linspace(DataType.FLOAT, 1.0f, 1.0f, 8).reshape(2,2,2);
         INDArray out = Nd4j.createUninitialized(2,2);
@@ -993,7 +954,7 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     @Test
     @Disabled
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDrawBoundingBoxesShape(Nd4jBackend backend) {
         INDArray images = Nd4j.createFromArray(new float[]{0.7788f, 0.8012f, 0.7244f,  0.2309f, 0.7271f,
                 0.1804f,0.5056f,0.8925f,0.5461f,0.9234f,0.0856f,0.7938f,0.6591f,0.5555f,0.1596f,
@@ -1037,9 +998,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWhereFail(Nd4jBackend backend) {
         INDArray in = Nd4j.createFromArray(new float[]{0f,    1.0000f,    1.0000f,    1.0000f,    1.0000f});
         INDArray out = Nd4j.createUninitialized(4,1);
@@ -1050,9 +1010,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testResizeBilinear1(Nd4jBackend backend) {
         INDArray x = Nd4j.rand(1, 10,10,4);
         INDArray z = Nd4j.createUninitialized(x.shape());
@@ -1062,9 +1021,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testResizeArea1(Nd4jBackend backend) {
 
         INDArray x = Nd4j.rand(DataType.FLOAT, 1, 2,3,4);
@@ -1074,9 +1032,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testResizeArea2(Nd4jBackend backend) {
 
         INDArray image = Nd4j.linspace(DataType.FLOAT, 1.0f, 1.0f, 9 ).reshape(1,3,3,1);
@@ -1097,9 +1054,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDivideNoNan(Nd4jBackend backend) {
         INDArray in1 = Nd4j.rand(DataType.DOUBLE, 2,3,4);
         INDArray in2 = Nd4j.rand(DataType.DOUBLE, 2,3,4);
@@ -1112,7 +1068,7 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     @Test
     @Disabled
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDrawBoundingBoxes(Nd4jBackend backend) {
         INDArray images = Nd4j.linspace(DataType.FLOAT, 1.0f, 1.0f, 2*4*5*3).reshape(2,4,5,3);
         INDArray boxes = Nd4j.createFromArray(new float[]{ 0.0f , 0.0f , 1.0f , 1.0f,
@@ -1142,9 +1098,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void FakeQuantWithMinMaxVarsPerChannel(Nd4jBackend backend) {
 
         INDArray x = Nd4j.createFromArray(new float[]{-63.80f, -63.75f, -63.4f, -63.5f, 0.0f, 0.1f}).
@@ -1162,9 +1117,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testKnnMinDistance(Nd4jBackend backend) {
         INDArray point = Nd4j.rand(DataType.FLOAT, 1, 20);
         INDArray lowest = Nd4j.rand(DataType.FLOAT, 1, 20);
@@ -1176,9 +1130,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLayersDropoutFail(Nd4jBackend backend) {
         INDArray input = Nd4j.rand(4, 5);
         INDArray output = Nd4j.createUninitialized(4, 5);
@@ -1188,9 +1141,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRange(){
         DynamicCustomOp op = DynamicCustomOp.builder("range")
                 .addFloatingPointArguments(-1.0, 1.0, 0.01)
@@ -1204,9 +1156,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBitCastShape_1(){
         val out = Nd4j.createUninitialized(1,10);
         BitCast op = new BitCast(Nd4j.zeros(DataType.FLOAT,1,10), DataType.INT.toInt(), out);
@@ -1216,9 +1167,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBitCastShape_2(){
         val out = Nd4j.createUninitialized(1,10);
         BitCast op = new BitCast(Nd4j.zeros(DataType.DOUBLE,1,10), DataType.INT.toInt(), out);
@@ -1228,9 +1178,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFusedBatchNorm(Nd4jBackend backend) {
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 2*2*3*4).reshape(2,2,3,4);
         INDArray scale = Nd4j.create(DataType.DOUBLE, 4);
@@ -1262,9 +1211,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFusedBatchNorm1(Nd4jBackend backend) {
         INDArray x = Nd4j.createFromArray(new float[]{0.7788f,0.8012f,0.7244f,0.2309f,
                 0.7271f, 0.1804f, 0.5056f, 0.8925f,
@@ -1293,9 +1241,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFusedBatchNormHalf(Nd4jBackend backend) {
         INDArray x = Nd4j.create(DataType.HALF, 1,2,3,4);
         //INDArray scale = Nd4j.createFromArray(new float[]{0.7717f, 0.9281f, 0.9846f, 0.4838f});
@@ -1313,9 +1260,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatrixBandPart(Nd4jBackend backend) {
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 2*3*3).reshape(2,3,3);
         val op = new MatrixBandPart(x,1,1);
@@ -1331,9 +1277,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
 
     @Disabled("AS failed 2019/12/04")
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPolygamma(Nd4jBackend backend) {
         INDArray n = Nd4j.linspace(DataType.FLOAT, 1.0, 1.0, 9).reshape(3,3);
         INDArray x = Nd4j.create(DataType.FLOAT, 3,3);
@@ -1347,9 +1292,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLgamma(Nd4jBackend backend) {
         INDArray x = Nd4j.createFromArray(new double[]{0.1, 0.5, 0.7, 1.5, 1.7, 2.0, 2.5, 2.7, 3.}).reshape(3,3);
         INDArray expected = Nd4j.createFromArray(new double[]{
@@ -1362,9 +1306,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRandomCrop(Nd4jBackend backend) {
         INDArray x = Nd4j.createFromArray(new double[]{1.8, 2.5,  4.,  9., 2.1, 2.4,  3.,  9.,2.1, 2.1, 0.7, 0.1,3., 4.2, 2.2, 1. }).reshape(2,2,4);
         INDArray shape = Nd4j.createFromArray(new int[] {1,2,3});
@@ -1373,9 +1316,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRoll(Nd4jBackend backend) {
         INDArray x = Nd4j.createFromArray(new double[]{    11.11, 11.12, 11.21, 11.22, 11.31, 11.32, 11.41, 11.42,     12.11, 12.12, 12.21, 12.22, 12.31, 12.32, 12.41, 12.42,
                 21.11, 21.12, 21.21, 21.22, 21.31, 21.32, 21.41, 21.42,     22.11, 22.12, 22.21, 22.22, 22.31, 22.32, 22.41, 22.42}).
@@ -1391,9 +1333,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToggleBits(Nd4jBackend backend) {
         INDArray input = Nd4j.createFromArray(new int[]{2,2});
         INDArray expected = Nd4j.createFromArray(new int[]{-3,-3});
@@ -1404,9 +1345,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
 
     @Disabled("AS 11.28.2019 - https://github.com/eclipse/deeplearning4j/issues/8449")
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNonMaxSuppression(Nd4jBackend backend) {
         INDArray boxes = Nd4j.createFromArray(new float[] {0.8115f,    0.4121f,    0.0771f,    0.4863f,
                 0.7412f,    0.7607f,    0.1543f,    0.5479f,
@@ -1418,9 +1358,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatrixBand(Nd4jBackend backend) {
         INDArray input = Nd4j.createFromArray(new float[]{0.7788f,0.8012f,0.7244f,0.2309f,
                 0.7271f,0.1804f,0.5056f,0.8925f,
@@ -1432,9 +1371,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
 
     @Disabled("Failed AS 11.26.2019 - https://github.com/eclipse/deeplearning4j/issues/8450")
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBetaInc1(Nd4jBackend backend) {
         INDArray a = Nd4j.createFromArray(new float[]{0.7788f,    0.8012f,    0.7244f,    0.2309f});
         INDArray b = Nd4j.createFromArray(new float[]{0.7717f,    0.9281f,    0.9846f,    0.4838f});
@@ -1447,9 +1385,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
 
     @Disabled("Failure AS 11.28.2019 - https://github.com/eclipse/deeplearning4j/issues/8452")
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPolygamma1(Nd4jBackend backend) {
         INDArray a = Nd4j.createFromArray(new float[]{0.7788f,    0.8012f,    0.7244f,    0.2309f,
                 0.7271f,    0.1804f,    0.5056f,    0.8925f,
@@ -1464,9 +1401,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRoll1(Nd4jBackend backend) {
         INDArray a = Nd4j.createFromArray(new float[]{0.7788f,    0.8012f,    0.7244f,    0.2309f});
         Roll op = new Roll(a,Nd4j.scalar(2),Nd4j.scalar(0));
@@ -1480,9 +1416,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAdjustHueShape(){
         INDArray image = Nd4j.createFromArray(new float[]{0.7788f,    0.8012f,    0.7244f,
                 0.2309f,    0.7271f,    0.1804f, 0.5056f,    0.8925f,    0.5461f,
@@ -1527,9 +1462,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBitCastShape_3(){
         val x = Nd4j.createFromArray(new int[]{1, 2, 3, 4, 5, 6, 7, 8}).reshape(1, 4, 2);
         val e = Nd4j.createFromArray(new long[]{8589934593L, 17179869187L, 25769803781L, 34359738375L}).reshape(1, 4);
@@ -1540,9 +1474,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatch_1(Nd4jBackend backend) {
         INDArray x = Nd4j.ones(DataType.FLOAT, 3,3);
         INDArray y = Nd4j.linspace(DataType.FLOAT, -5, 9, 1).reshape(3, 3);
@@ -1559,9 +1492,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCreateOp_1(Nd4jBackend backend) {
         val shape = Nd4j.createFromArray(new int[] {3, 4, 5});
         val exp = Nd4j.create(DataType.INT, 3, 4, 5);
@@ -1575,7 +1507,7 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     @Test
     @Disabled
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRgbToHsv(Nd4jBackend backend) {
         INDArray expected = Nd4j.createFromArray(new float[]{
                 0.545678377f, 0.644941628f, 0.461456001f, 0.588904262f, 0.725874603f,
@@ -1612,9 +1544,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
 
     // Exact copy of libnd4j test
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testHsvToRgb(Nd4jBackend backend) {
         INDArray input = Nd4j.createFromArray(new float[]{0.705504596f, 0.793608069f, 0.65870738f, 0.848827183f, 0.920532584f,
                 0.887555957f, 0.72317636f, 0.563831031f, 0.773604929f, 0.269532293f,
@@ -1630,9 +1561,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testHsvToRgb_1(Nd4jBackend backend) {
         /* Emulation of simple TF test:
            image = tf.random_uniform(shape = [1,1,3])
@@ -1647,9 +1577,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRgbToHsv_1(Nd4jBackend backend) {
         /* Emulation of simple TF test:
            image = tf.random_uniform(shape = [1,2,3])
@@ -1664,9 +1593,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLu(Nd4jBackend backend) {
         INDArray input = Nd4j.createFromArray(new float[]{1.f, 2.f, 3.f, 0.f, 2.f, 3.f, 0.f, 0.f, 7.f})
                 .reshape(3,3);
@@ -1678,9 +1606,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRgbToYiq(Nd4jBackend backend) {
         INDArray image = Nd4j.createFromArray(new float[]{
                 0.48055f   , 0.80757356f, 0.2564435f , 0.94277316f, 0.17006584f,
@@ -1718,9 +1645,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testYiqToRgb(Nd4jBackend backend) {
         INDArray image = Nd4j.createFromArray(new float[]{
                 0.775258899f, -0.288912386f, -0.132725924f, 0.0664454922f, -0.212469354f,
@@ -1758,9 +1684,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRgbToGrayscale(Nd4jBackend backend) {
         INDArray image = Nd4j.createFromArray(new float[]{
                 1.7750e+01f, -7.1062e+01f, -1.0019e+02f,-2.3406e+01f,  5.2094e+01f,
@@ -1791,9 +1716,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRgbToYuv(Nd4jBackend backend) {
         INDArray image = Nd4j.createFromArray(new float[]{
                 10f,50f,200f
@@ -1809,9 +1733,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testYuvToRgb(Nd4jBackend backend) {
         INDArray image = Nd4j.createFromArray(new float[]{
                 55.14f , 71.2872001f, -39.6005542f
@@ -1826,9 +1749,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRgbToYiqEmpty(Nd4jBackend backend) {
         INDArray image = Nd4j.create(0,4,3);
         RgbToYiq op = new RgbToYiq(image);
@@ -1837,9 +1759,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTriangularSolve(Nd4jBackend backend) {
         INDArray a = Nd4j.createFromArray(new float[]{
                 3.f, 0.f, 0.f, 0.f,
@@ -1863,9 +1784,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOnesLike_1(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.FLOAT, 3, 4, 5);
         val e = Nd4j.ones(DataType.INT32, 3, 4, 5);
@@ -1875,9 +1795,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLinSpaceEdge_1(Nd4jBackend backend) {
         val x = Nd4j.linspace(1,10,1, DataType.FLOAT);
         val e = Nd4j.scalar(1.0f);
@@ -1886,9 +1805,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLinearSolve(Nd4jBackend backend) {
         INDArray a = Nd4j.createFromArray(new float[]{
                 2.f, -1.f, -2.f, -4.f, 6.f, 3.f, -4.f, -2.f, 8.f
@@ -1909,9 +1827,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLinearSolveAdjust(Nd4jBackend backend) {
         INDArray a = Nd4j.createFromArray(new float[]{
                 0.7788f,    0.8012f,    0.7244f,
@@ -1938,9 +1855,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLstsq(Nd4jBackend backend) {
         INDArray a = Nd4j.createFromArray(new float[]{
                 1.f,  2.f,  3.f,
@@ -1963,9 +1879,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSequenceMask(Nd4jBackend backend) {
         INDArray arr = Nd4j.createFromArray(new int[]{1, 3, 2});
         // Test with static max len
@@ -1981,9 +1896,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCholesky(Nd4jBackend backend) {
         INDArray x = Nd4j.createFromArray(new double[] {4,12,-16, 12 ,37,-43, -16, -43, 98}).reshape(3,3);
         INDArray exp = Nd4j.createFromArray(new double[] {2.,  0.,  0., 6., 1.,  0., -8.,  5.,  3.}).reshape(3,3);
@@ -1993,9 +1907,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testQr(Nd4jBackend backend) {
         INDArray in = Nd4j.createFromArray(new double[]{
                 12.,  -51.,    4.,        6.,   167.,  -68.,       -4.,    24.,  -41.,       -1.,     1.,    0.,        2.,     0.,    3.
@@ -2012,9 +1925,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLinspaceSignature_1() throws Exception {
         val array1 = Nd4j.exec(new Linspace(DataType.FLOAT, Nd4j.scalar(1.0f), Nd4j.scalar(10.f), Nd4j.scalar(10L)))[0];
         val array2 = Nd4j.exec(new Linspace(DataType.FLOAT, 1.0f, 10.f, 10L))[0];
@@ -2024,9 +1936,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLogdet(Nd4jBackend backend) {
         INDArray x = Nd4j.createFromArray(new double[]{
                 4,12,-16,12,37,-43,-16,-43,98, 4,1.2,-1.6,1.2,3.7,-4.3,-1.6,-4.3,9.8
@@ -2039,9 +1950,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBatchNormBpNHWC(){
         //Nd4j.getEnvironment().allowHelpers(false);        //Passes if helpers/MKLDNN is disabled
 
@@ -2086,9 +1996,8 @@ public class CustomOpsTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSpaceToDepthBadStrides(){
         INDArray in = Nd4j.rand(DataType.FLOAT, 2, 3, 6, 6);
         INDArray inBadStrides = in.permute(1,0,2,3).dup().permute(1,0,2,3);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/custom/ExpandableOpsTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/custom/ExpandableOpsTests.java
index ee03f8154..771a2fc3d 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/custom/ExpandableOpsTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/custom/ExpandableOpsTests.java
@@ -43,9 +43,8 @@ public class ExpandableOpsTests extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCompatStringSplit_1(Nd4jBackend backend) throws Exception {
         val array = Nd4j.create("first string", "second");
         val delimiter = Nd4j.create(" ");
@@ -61,9 +60,8 @@ public class ExpandableOpsTests extends BaseNd4jTestWithBackends {
         assertEquals(exp1, results[1]);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test(Nd4jBackend backend) {
         val arr = Nd4j.createFromArray(0, 1, 2, 3, 4, 5, 6, 7, 8).reshape(3, 3);
         Nd4j.exec(new PrintVariable(arr));
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/BalanceMinibatchesTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/BalanceMinibatchesTest.java
index 072419e73..056bc7ba3 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/BalanceMinibatchesTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/BalanceMinibatchesTest.java
@@ -42,9 +42,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 public class BalanceMinibatchesTest extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBalance(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         DataSetIterator iterator = new IrisDataSetIterator(10, 150);
 
@@ -61,9 +60,8 @@ public class BalanceMinibatchesTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMiniBatchBalanced(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
 
         int miniBatchSize = 100;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/CachingDataSetIteratorTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/CachingDataSetIteratorTest.java
index 0e5928f4d..a23b009eb 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/CachingDataSetIteratorTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/CachingDataSetIteratorTest.java
@@ -52,18 +52,16 @@ public class CachingDataSetIteratorTest extends BaseNd4jTestWithBackends {
         return 'f';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInMemory(Nd4jBackend backend) {
         DataSetCache cache = new InMemoryDataSetCache();
 
         runDataSetTest(cache);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInFile() throws IOException {
         Path cacheDir = Files.createTempDirectory("nd4j-data-set-cache-test");
         DataSetCache cache = new InFileDataSetCache(cacheDir);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/DataSetTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/DataSetTest.java
index b79852d52..a0e14ac16 100755
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/DataSetTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/DataSetTest.java
@@ -52,9 +52,8 @@ import static org.nd4j.linalg.indexing.NDArrayIndex.*;
 
 public class DataSetTest extends BaseNd4jTestWithBackends {
     
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testViewIterator(Nd4jBackend backend) {
         DataSetIterator iter = new ViewIterator(new IrisDataSetIterator(150, 150).next(), 10);
         assertTrue(iter.hasNext());
@@ -71,9 +70,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
         assertTrue(iter.hasNext());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void  testViewIterator2(Nd4jBackend backend){
 
         INDArray f = Nd4j.linspace(1,100,100, DataType.DOUBLE).reshape('c', 10, 10);
@@ -89,9 +87,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
         assertFalse(iter.hasNext());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void  testViewIterator3(Nd4jBackend backend){
 
         INDArray f = Nd4j.linspace(1,100,100, DataType.DOUBLE).reshape('c', 10, 10);
@@ -109,9 +106,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
 
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSplitTestAndTrain    (Nd4jBackend backend) {
         INDArray labels = FeatureUtil.toOutcomeMatrix(new int[] {0, 0, 0, 0, 0, 0, 0, 0}, 1);
         DataSet data = new DataSet(Nd4j.rand(8, 1), labels);
@@ -131,9 +127,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSplitTestAndTrainRng(Nd4jBackend backend) {
 
         Random rngHere;
@@ -155,9 +150,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLabelCounts(Nd4jBackend backend) {
         DataSet x0 = new IrisDataSetIterator(150, 150).next();
         assertEquals(0, x0.get(0).outcome(),getFailureMessage());
@@ -170,9 +164,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTimeSeriesMerge(Nd4jBackend backend) {
         //Basic test for time series, all of the same length + no masking arrays
         int numExamples = 10;
@@ -209,9 +202,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTimeSeriesMergeDifferentLength(Nd4jBackend backend) {
         //Test merging of time series with different lengths -> no masking arrays on the input DataSets
 
@@ -304,9 +296,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTimeSeriesMergeWithMasking(Nd4jBackend backend) {
         //Test merging of time series with (a) different lengths, and (b) mask arrays in the input DataSets
 
@@ -415,9 +406,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCnnMerge (Nd4jBackend backend) {
         //Test merging of CNN data sets
         int nOut = 3;
@@ -496,9 +486,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCnnMergeFeatureMasks(Nd4jBackend backend) {
         //Tests merging of different CNN masks: [mb,1,h,1], [mb,1,1,w], [mb,1,h,w]
 
@@ -615,9 +604,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMixedRnn2dMerging (Nd4jBackend backend) {
         //RNN input with 2d label output
         //Basic test for time series, all of the same length + no masking arrays
@@ -655,9 +643,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMergingWithPerOutputMasking (Nd4jBackend backend) {
 
         //Test 2d mask merging, 2d data
@@ -730,9 +717,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
         assertEquals(expLM2d, merged3d2d.getLabelsMaskArray());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testShuffle4d(Nd4jBackend backend) {
         int nSamples = 10;
         int nChannels = 3;
@@ -763,9 +749,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testShuffleNd(Nd4jBackend backend) {
             int numDims = 7;
             int nLabels = 3;
@@ -815,9 +800,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
             }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testShuffleMeta(Nd4jBackend backend) {
         int nExamples = 20;
         int nColumns = 4;
@@ -851,9 +835,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLabelNames(Nd4jBackend backend) {
         List<String> names = Arrays.asList("label1", "label2", "label3", "label0");
         INDArray features = Nd4j.ones(10);
@@ -865,9 +848,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
         assertEquals(names, ds.getLabelNames(labels));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToString(Nd4jBackend backend) {
         org.nd4j.linalg.dataset.api.DataSet ds = new DataSet();
         //this should not throw a null pointer
@@ -894,9 +876,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetRangeMask(Nd4jBackend backend) {
         org.nd4j.linalg.dataset.api.DataSet ds = new DataSet();
         //Checking printing of masks
@@ -925,9 +906,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
         assertEquals(exp, act);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAsList(Nd4jBackend backend) {
         org.nd4j.linalg.dataset.api.DataSet ds;
         //Comparing merge with asList
@@ -963,9 +943,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDataSetSaveLoad(Nd4jBackend backend) throws IOException {
 
         boolean[] b = new boolean[] {true, false};
@@ -1014,9 +993,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDataSetSaveLoadSingle(Nd4jBackend backend) throws IOException {
 
         INDArray f = Nd4j.linspace(1, 24, 24, DataType.DOUBLE).reshape('c', 4, 3, 2);
@@ -1054,9 +1032,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
             assertTrue(ds2.getFeatures() == ds2.getLabels()); //Expect same object
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMdsShuffle(Nd4jBackend backend) {
 
         MultiDataSet orig = new MultiDataSet(Nd4j.linspace(1,100,100, DataType.DOUBLE).reshape('c',10,10),
@@ -1093,9 +1070,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
         assertTrue(allL);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSample4d(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(12345);
         int next1 = Nd4j.getRandom().nextInt(4);
@@ -1120,9 +1096,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.valueArrayOf(new long[]{1, 5, 5}, (double)next2), ds2.getLabels().get(point(1), all(), all(), all()));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDataSetMetaDataSerialization(@TempDir Path testDir,Nd4jBackend backend) throws IOException {
 
         for(boolean withMeta : new boolean[]{false, true}) {
@@ -1152,9 +1127,8 @@ public class DataSetTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultiDataSetMetaDataSerialization(@TempDir Path testDir,Nd4jBackend nd4jBackend) throws IOException {
 
         for(boolean withMeta : new boolean[]{false, true}) {
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/ImagePreProcessortTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/ImagePreProcessortTest.java
index cdabf5cdb..ab0bbec1d 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/ImagePreProcessortTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/ImagePreProcessortTest.java
@@ -41,9 +41,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ImagePreProcessortTest extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void simpleImageTest(Nd4jBackend backend) {
         INDArray rChannels = Nd4j.zeros(DataType.FLOAT, 10, 10).addi(128);
         INDArray gChannels = Nd4j.zeros(DataType.FLOAT, 10, 10).addi(64);
@@ -103,9 +102,8 @@ public class ImagePreProcessortTest extends BaseNd4jTestWithBackends {
         assertEquals(orig, before);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void simpleImageTestMulti(Nd4jBackend backend) {
         INDArray rChannels = Nd4j.zeros(10, 10).addi(128);
         INDArray gChannels = Nd4j.zeros(10, 10).addi(64);
@@ -161,9 +159,8 @@ public class ImagePreProcessortTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSegmentation(Nd4jBackend backend){
 
         INDArray f = Nd4j.math().floor(Nd4j.rand(DataType.FLOAT, 3, 3, 16, 16).muli(255));
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/KFoldIteratorTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/KFoldIteratorTest.java
index fc21524d9..152466d7d 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/KFoldIteratorTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/KFoldIteratorTest.java
@@ -45,9 +45,8 @@ public class KFoldIteratorTest extends BaseNd4jTestWithBackends {
      * and check that every example will be exactly once in the test set,
      * and the sum of the number of test examples in all folds equals to the number of examples.
      */
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void checkTestFoldContent(Nd4jBackend backend) {
 
         final int numExamples = 42;
@@ -79,9 +78,8 @@ public class KFoldIteratorTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void checkFolds(Nd4jBackend backend) {
         // Expected batch sizes: 3+3+3+2 = 11 total examples
         int[] batchSizesExp = new int[] {3, 3, 3, 2};
@@ -120,9 +118,8 @@ public class KFoldIteratorTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void checkCornerCase(Nd4jBackend backend) {
         // Expected batch sizes: 2+1 = 3 total examples
         int[] batchSizesExp = new int[] {2, 1};
@@ -231,9 +228,8 @@ public class KFoldIteratorTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test5974(Nd4jBackend backend){
         DataSet ds = new DataSet(Nd4j.linspace(1,99,99, DataType.DOUBLE).reshape(-1, 1),
                 Nd4j.linspace(1,99,99, DataType.DOUBLE).reshape(-1, 1));
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MinMaxStatsTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MinMaxStatsTest.java
index adbf82aae..3628de7d9 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MinMaxStatsTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MinMaxStatsTest.java
@@ -38,9 +38,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class MinMaxStatsTest extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEnforcingNonZeroRange(Nd4jBackend backend) {
         INDArray lower = Nd4j.create(new double[] {2, 3, 4, 5});
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MiniBatchFileDataSetIteratorTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MiniBatchFileDataSetIteratorTest.java
index b39b7c90d..4b4196e98 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MiniBatchFileDataSetIteratorTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MiniBatchFileDataSetIteratorTest.java
@@ -39,9 +39,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class MiniBatchFileDataSetIteratorTest extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMiniBatches(@TempDir Path testDir) throws Exception {
         DataSet load = new IrisDataSetIterator(150, 150).next();
         final MiniBatchFileDataSetIterator iter = new MiniBatchFileDataSetIterator(load, 10, false, testDir.toFile());
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MultiDataSetTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MultiDataSetTest.java
index 64391e818..39a39520b 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MultiDataSetTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MultiDataSetTest.java
@@ -48,9 +48,8 @@ import static org.nd4j.linalg.indexing.NDArrayIndex.interval;
 
 public class MultiDataSetTest extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMerging2d(Nd4jBackend backend) {
         //Simple test: single input/output arrays; 5 MultiDataSets to merge
         int nCols = 3;
@@ -78,9 +77,8 @@ public class MultiDataSetTest extends BaseNd4jTestWithBackends {
         assertEquals(expOut, merged.getLabels(0));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMerging2dMultipleInOut(Nd4jBackend backend) {
         //Test merging: Multiple input/output arrays; 5 MultiDataSets to merge
 
@@ -124,9 +122,8 @@ public class MultiDataSetTest extends BaseNd4jTestWithBackends {
         assertEquals(expOut1, merged.getLabels(1));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMerging2dMultipleInOut2(Nd4jBackend backend) {
         //Test merging: Multiple input/output arrays; 5 MultiDataSets to merge
 
@@ -180,9 +177,8 @@ public class MultiDataSetTest extends BaseNd4jTestWithBackends {
         assertEquals(expOut2, merged.getLabels(2));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMerging2dMultipleInOut3(Nd4jBackend backend) {
         //Test merging: fewer rows than output arrays...
 
@@ -224,9 +220,8 @@ public class MultiDataSetTest extends BaseNd4jTestWithBackends {
         assertEquals(expOut2, merged.getLabels(2));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMerging4dMultipleInOut(Nd4jBackend backend) {
         int nRows = 5;
         int depthIn0 = 3;
@@ -280,9 +275,8 @@ public class MultiDataSetTest extends BaseNd4jTestWithBackends {
         assertEquals(expOut1, merged.getLabels(1));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMergingTimeSeriesEqualLength(Nd4jBackend backend) {
         int tsLength = 8;
         int nRows = 5;
@@ -337,9 +331,8 @@ public class MultiDataSetTest extends BaseNd4jTestWithBackends {
         assertEquals(expOut1, merged.getLabels(1));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMergingTimeSeriesWithMasking(Nd4jBackend backend) {
         //Mask arrays, and different lengths
 
@@ -440,9 +433,8 @@ public class MultiDataSetTest extends BaseNd4jTestWithBackends {
         assertEquals(expectedMaskOut1, merged.getLabelsMaskArray(1));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMergingWithPerOutputMasking(Nd4jBackend backend) {
 
         //Test 2d mask merging, 2d data
@@ -515,9 +507,8 @@ public class MultiDataSetTest extends BaseNd4jTestWithBackends {
         assertEquals(expLM2d, merged3d2d.getLabelsMaskArray(0));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSplit(Nd4jBackend backend) {
 
         INDArray[] features = new INDArray[3];
@@ -579,9 +570,8 @@ public class MultiDataSetTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToString(Nd4jBackend backend) {
         //Mask arrays, and different lengths
 
@@ -668,9 +658,8 @@ public class MultiDataSetTest extends BaseNd4jTestWithBackends {
         System.out.println(merged);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void multiDataSetSaveLoadTest() throws IOException {
 
         int max = 3;
@@ -725,9 +714,8 @@ public class MultiDataSetTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCnnMergeFeatureMasks(Nd4jBackend backend) {
         //Tests merging of different CNN masks: [mb,1,h,1], [mb,1,1,w], [mb,1,h,w]
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MultiNormalizerHybridTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MultiNormalizerHybridTest.java
index 58bc669de..3d6d0b1ea 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MultiNormalizerHybridTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MultiNormalizerHybridTest.java
@@ -51,9 +51,8 @@ public class MultiNormalizerHybridTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNoNormalizationByDefault(Nd4jBackend backend) {
         SUT.fit(data);
         SUT.preProcess(data);
@@ -63,9 +62,8 @@ public class MultiNormalizerHybridTest extends BaseNd4jTestWithBackends {
         assertEquals(dataCopy, data);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGlobalNormalization(Nd4jBackend backend) {
         SUT.standardizeAllInputs().minMaxScaleAllOutputs(-10, 10).fit(data);
         SUT.preProcess(data);
@@ -82,9 +80,8 @@ public class MultiNormalizerHybridTest extends BaseNd4jTestWithBackends {
         assertEquals(dataCopy, data);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSpecificInputOutputNormalization(Nd4jBackend backend) {
         SUT.minMaxScaleAllInputs().standardizeInput(1).standardizeOutput(0).fit(data);
         SUT.preProcess(data);
@@ -101,9 +98,8 @@ public class MultiNormalizerHybridTest extends BaseNd4jTestWithBackends {
         assertEquals(dataCopy, data);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMasking(Nd4jBackend backend) {
         MultiDataSet timeSeries = new MultiDataSet(
                 new INDArray[] {Nd4j.create(new float[] {1, 2, 3, 4, 5, 0, 7, 0}).reshape(2, 2, 2),},
@@ -128,9 +124,8 @@ public class MultiNormalizerHybridTest extends BaseNd4jTestWithBackends {
         assertEquals(timeSeriesCopy, timeSeries);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDataSetWithoutLabels(Nd4jBackend backend) {
         SUT.standardizeAllInputs().standardizeAllOutputs().fit(data);
 
@@ -140,9 +135,8 @@ public class MultiNormalizerHybridTest extends BaseNd4jTestWithBackends {
         SUT.preProcess(data);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDataSetWithoutFeatures(Nd4jBackend backend) {
         SUT.standardizeAllInputs().standardizeAllOutputs().fit(data);
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MultiNormalizerMinMaxScalerTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MultiNormalizerMinMaxScalerTest.java
index 48c71d4c3..acd7e5e75 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MultiNormalizerMinMaxScalerTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MultiNormalizerMinMaxScalerTest.java
@@ -68,26 +68,23 @@ public class MultiNormalizerMinMaxScalerTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultipleInputsAndOutputsWithDataSet(Nd4jBackend backend) {
         SUT.fit(data);
         assertExpectedMinMax();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultipleInputsAndOutputsWithIterator(Nd4jBackend backend) {
         MultiDataSetIterator iter = new TestMultiDataSetIterator(1, data);
         SUT.fit(iter);
         assertExpectedMinMax();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRevertFeaturesINDArray(Nd4jBackend backend) {
         SUT.fit(data);
 
@@ -103,9 +100,8 @@ public class MultiNormalizerMinMaxScalerTest extends BaseNd4jTestWithBackends {
         assertEquals(reverted, transformed.getFeatures(0));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRevertLabelsINDArray(Nd4jBackend backend) {
         SUT.fit(data);
 
@@ -121,9 +117,8 @@ public class MultiNormalizerMinMaxScalerTest extends BaseNd4jTestWithBackends {
         assertEquals(reverted, transformed.getLabels(0));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRevertMultiDataSet(Nd4jBackend backend) {
         SUT.fit(data);
 
@@ -139,9 +134,8 @@ public class MultiNormalizerMinMaxScalerTest extends BaseNd4jTestWithBackends {
         assertTrue(diffAfterRevert < TOLERANCE_PERC);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFullyMaskedData() {
         MultiDataSetIterator iter = new TestMultiDataSetIterator(1,
                 new MultiDataSet(new INDArray[] {Nd4j.create(new float[] {1}).reshape(1, 1, 1)},
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MultiNormalizerStandardizeTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MultiNormalizerStandardizeTest.java
index 8f3a40d18..a833269b0 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MultiNormalizerStandardizeTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/MultiNormalizerStandardizeTest.java
@@ -67,26 +67,23 @@ public class MultiNormalizerStandardizeTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultipleInputsAndOutputsWithDataSet(Nd4jBackend backend) {
         SUT.fit(data);
         assertExpectedMeanStd();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultipleInputsAndOutputsWithIterator(Nd4jBackend backend) {
         MultiDataSetIterator iter = new TestMultiDataSetIterator(1, data);
         SUT.fit(iter);
         assertExpectedMeanStd();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRevertFeaturesINDArray(Nd4jBackend backend) {
         SUT.fit(data);
 
@@ -102,9 +99,8 @@ public class MultiNormalizerStandardizeTest extends BaseNd4jTestWithBackends {
         assertEquals(reverted, transformed.getFeatures(0));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRevertLabelsINDArray(Nd4jBackend backend) {
         SUT.fit(data);
 
@@ -120,9 +116,8 @@ public class MultiNormalizerStandardizeTest extends BaseNd4jTestWithBackends {
         assertEquals(reverted, transformed.getLabels(0));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRevertMultiDataSet(Nd4jBackend backend) {
         SUT.fit(data);
 
@@ -138,9 +133,8 @@ public class MultiNormalizerStandardizeTest extends BaseNd4jTestWithBackends {
         assertTrue(diffAfterRevert < TOLERANCE_PERC);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFullyMaskedData(Nd4jBackend backend) {
         MultiDataSetIterator iter = new TestMultiDataSetIterator(1,
                 new MultiDataSet(new INDArray[] {Nd4j.create(new float[] {1}).reshape(1, 1, 1)},
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/NormalizerMinMaxScalerTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/NormalizerMinMaxScalerTest.java
index 36bf8d76c..7ce85c482 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/NormalizerMinMaxScalerTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/NormalizerMinMaxScalerTest.java
@@ -42,9 +42,8 @@ import static org.junit.jupiter.api.Assertions.*;
 public class NormalizerMinMaxScalerTest extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBruteForce(Nd4jBackend backend) {
         //X_std = (X - X.min(axis=0)) / (X.max(axis=0) - X.min(axis=0))
         //X_scaled = X_std * (max - min) + min
@@ -97,9 +96,8 @@ public class NormalizerMinMaxScalerTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRevert(Nd4jBackend backend) {
         double tolerancePerc = 1; // 1% of correct value
         int nSamples = 500;
@@ -124,9 +122,8 @@ public class NormalizerMinMaxScalerTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGivenMaxMin(Nd4jBackend backend) {
         double tolerancePerc = 1; // 1% of correct value
         int nSamples = 500;
@@ -153,9 +150,8 @@ public class NormalizerMinMaxScalerTest extends BaseNd4jTestWithBackends {
         assertTrue(maxdeltaPerc < tolerancePerc);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGivenMaxMinConstant(Nd4jBackend backend) {
         double tolerancePerc = 1; // 1% of correct value
         int nSamples = 500;
@@ -180,9 +176,8 @@ public class NormalizerMinMaxScalerTest extends BaseNd4jTestWithBackends {
         assertTrue(maxdeltaPerc < tolerancePerc);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConstant(Nd4jBackend backend) {
         double tolerancePerc = 0.01; // 0.01% of correct value
         int nSamples = 500;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/NormalizerSerializerTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/NormalizerSerializerTest.java
index b095f419b..091e5ccd7 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/NormalizerSerializerTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/NormalizerSerializerTest.java
@@ -68,9 +68,8 @@ public class NormalizerSerializerTest extends BaseNd4jTestWithBackends {
         SUT = NormalizerSerializer.getDefault();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testImagePreProcessingScaler() throws Exception {
         ImagePreProcessingScaler imagePreProcessingScaler = new ImagePreProcessingScaler(0,1);
         SUT.write(imagePreProcessingScaler,tmpFile);
@@ -79,9 +78,8 @@ public class NormalizerSerializerTest extends BaseNd4jTestWithBackends {
         assertEquals(imagePreProcessingScaler,restored);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNormalizerStandardizeNotFitLabels() throws Exception {
         NormalizerStandardize original = new NormalizerStandardize(Nd4j.create(new double[] {0.5, 1.5}).reshape(1, -1),
                 Nd4j.create(new double[] {2.5, 3.5}).reshape(1, -1));
@@ -92,9 +90,8 @@ public class NormalizerSerializerTest extends BaseNd4jTestWithBackends {
         assertEquals(original, restored);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNormalizerStandardizeFitLabels() throws Exception {
         NormalizerStandardize original = new NormalizerStandardize(Nd4j.create(new double[] {0.5, 1.5}).reshape(1, -1),
                 Nd4j.create(new double[] {2.5, 3.5}).reshape(1, -1), Nd4j.create(new double[] {4.5, 5.5}).reshape(1, -1),
@@ -107,9 +104,8 @@ public class NormalizerSerializerTest extends BaseNd4jTestWithBackends {
         assertEquals(original, restored);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNormalizerMinMaxScalerNotFitLabels() throws Exception {
         NormalizerMinMaxScaler original = new NormalizerMinMaxScaler(0.1, 0.9);
         original.setFeatureStats(Nd4j.create(new double[] {0.5, 1.5}).reshape(1, -1), Nd4j.create(new double[] {2.5, 3.5}).reshape(1, -1));
@@ -120,9 +116,8 @@ public class NormalizerSerializerTest extends BaseNd4jTestWithBackends {
         assertEquals(original, restored);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNormalizerMinMaxScalerFitLabels() throws Exception {
         NormalizerMinMaxScaler original = new NormalizerMinMaxScaler(0.1, 0.9);
         original.setFeatureStats(Nd4j.create(new double[] {0.5, 1.5}), Nd4j.create(new double[] {2.5, 3.5}));
@@ -135,9 +130,8 @@ public class NormalizerSerializerTest extends BaseNd4jTestWithBackends {
         assertEquals(original, restored);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultiNormalizerStandardizeNotFitLabels() throws Exception {
         MultiNormalizerStandardize original = new MultiNormalizerStandardize();
         original.setFeatureStats(asList(
@@ -152,9 +146,8 @@ public class NormalizerSerializerTest extends BaseNd4jTestWithBackends {
         assertEquals(original, restored);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultiNormalizerStandardizeFitLabels() throws Exception {
         MultiNormalizerStandardize original = new MultiNormalizerStandardize();
         original.setFeatureStats(asList(
@@ -176,9 +169,8 @@ public class NormalizerSerializerTest extends BaseNd4jTestWithBackends {
         assertEquals(original, restored);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultiNormalizerMinMaxScalerNotFitLabels() throws Exception {
         MultiNormalizerMinMaxScaler original = new MultiNormalizerMinMaxScaler(0.1, 0.9);
         original.setFeatureStats(asList(
@@ -192,9 +184,8 @@ public class NormalizerSerializerTest extends BaseNd4jTestWithBackends {
         assertEquals(original, restored);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultiNormalizerMinMaxScalerFitLabels() throws Exception {
         MultiNormalizerMinMaxScaler original = new MultiNormalizerMinMaxScaler(0.1, 0.9);
         original.setFeatureStats(asList(
@@ -214,9 +205,8 @@ public class NormalizerSerializerTest extends BaseNd4jTestWithBackends {
         assertEquals(original, restored);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultiNormalizerHybridEmpty() throws Exception {
         MultiNormalizerHybrid original = new MultiNormalizerHybrid();
         original.setInputStats(new HashMap<Integer, NormalizerStats>());
@@ -228,9 +218,8 @@ public class NormalizerSerializerTest extends BaseNd4jTestWithBackends {
         assertEquals(original, restored);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultiNormalizerHybridGlobalStats() throws Exception {
         MultiNormalizerHybrid original = new MultiNormalizerHybrid().minMaxScaleAllInputs().standardizeAllOutputs();
 
@@ -251,9 +240,8 @@ public class NormalizerSerializerTest extends BaseNd4jTestWithBackends {
         assertEquals(original, restored);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultiNormalizerHybridGlobalAndSpecificStats() throws Exception {
         MultiNormalizerHybrid original = new MultiNormalizerHybrid().standardizeAllInputs().minMaxScaleInput(0, -5, 5)
                 .minMaxScaleAllOutputs(-10, 10).standardizeOutput(1);
@@ -283,9 +271,8 @@ public class NormalizerSerializerTest extends BaseNd4jTestWithBackends {
         });
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCustomNormalizer() throws Exception {
         MyNormalizer original = new MyNormalizer(42);
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/NormalizerStandardizeLabelsTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/NormalizerStandardizeLabelsTest.java
index 4b8b36e6d..5fee9eb30 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/NormalizerStandardizeLabelsTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/NormalizerStandardizeLabelsTest.java
@@ -39,9 +39,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class NormalizerStandardizeLabelsTest extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBruteForce(Nd4jBackend backend) {
         /* This test creates a dataset where feature values are multiples of consecutive natural numbers
            The obtained values are compared to the theoretical mean and std dev
@@ -105,9 +104,8 @@ public class NormalizerStandardizeLabelsTest extends BaseNd4jTestWithBackends {
         assertTrue(maxStdDeltaPerc < tolerancePerc);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTransform(Nd4jBackend backend) {
         /*Random dataset is generated such that
             AX + B where X is from a normal distribution with mean 0 and std 1
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/NormalizerStandardizeTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/NormalizerStandardizeTest.java
index cf7d253ba..5dfe18d8d 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/NormalizerStandardizeTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/NormalizerStandardizeTest.java
@@ -44,9 +44,8 @@ public class NormalizerStandardizeTest extends BaseNd4jTestWithBackends {
         return 60_000L;
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBruteForce(Nd4jBackend backend) {
         /* This test creates a dataset where feature values are multiples of consecutive natural numbers
            The obtained values are compared to the theoretical mean and std dev
@@ -99,9 +98,8 @@ public class NormalizerStandardizeTest extends BaseNd4jTestWithBackends {
         assertTrue(maxStdDeltaPerc < tolerancePerc);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTransform(Nd4jBackend backend) {
         /*Random dataset is generated such that
             AX + B where X is from a normal distribution with mean 0 and std 1
@@ -173,9 +171,8 @@ public class NormalizerStandardizeTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDifferentBatchSizes(Nd4jBackend backend) {
         // Create 6x1 matrix of the numbers 1 through 6
         INDArray values = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(1, -1).transpose();
@@ -209,9 +206,8 @@ public class NormalizerStandardizeTest extends BaseNd4jTestWithBackends {
         assertEquals(1.70783f, norm4.getStd().getFloat(0), 1e-4);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUnderOverflow(Nd4jBackend backend) {
         // This dataset will be basically constant with a small std deviation
         // And the constant is large. Checking if algorithm can handle
@@ -244,9 +240,8 @@ public class NormalizerStandardizeTest extends BaseNd4jTestWithBackends {
         myNormalizer.transform(sampleDataSet);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRevert(Nd4jBackend backend) {
         double tolerancePerc = 0.01; // 0.01% of correct value
         int nSamples = 500;
@@ -269,9 +264,8 @@ public class NormalizerStandardizeTest extends BaseNd4jTestWithBackends {
         assertTrue(maxdeltaPerc < tolerancePerc);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConstant(Nd4jBackend backend) {
         double tolerancePerc = 10.0; // 10% of correct value
         int nSamples = 500;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/NormalizerTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/NormalizerTests.java
index 5f0c5a7a7..15feda1df 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/NormalizerTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/NormalizerTests.java
@@ -75,9 +75,8 @@ public class NormalizerTests extends BaseNd4jTestWithBackends {
         minMaxScaler = new NormalizerMinMaxScaler();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPreProcessors(Nd4jBackend backend) {
         System.out.println("Running iterator vs non-iterator std scaler..");
         double d1 = testItervsDataset(stdScaler);
@@ -110,9 +109,8 @@ public class NormalizerTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMasking(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(235);
 
@@ -228,9 +226,8 @@ public class NormalizerTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNormalizerToStringHashCode(){
         //https://github.com/eclipse/deeplearning4j/issues/8565
 
@@ -265,9 +262,8 @@ public class NormalizerTests extends BaseNd4jTestWithBackends {
         n.hashCode();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultiNormalizerToStringHashCode(){
         //https://github.com/eclipse/deeplearning4j/issues/8565
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/PreProcessor3D4DTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/PreProcessor3D4DTest.java
index ef8e0fc77..ed85afbd1 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/PreProcessor3D4DTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/PreProcessor3D4DTest.java
@@ -48,9 +48,8 @@ import static org.junit.jupiter.api.Assertions.*;
 public class PreProcessor3D4DTest extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBruteForce3d(Nd4jBackend backend) {
 
         NormalizerStandardize myNormalizer = new NormalizerStandardize();
@@ -87,9 +86,8 @@ public class PreProcessor3D4DTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBruteForce3dMaskLabels(Nd4jBackend backend) {
 
         NormalizerStandardize myNormalizer = new NormalizerStandardize();
@@ -147,9 +145,8 @@ public class PreProcessor3D4DTest extends BaseNd4jTestWithBackends {
         assertEquals(myMinMaxScaler.getLabelMax().castTo(DataType.FLOAT), fullDataSetNoMask.expectedMax.castTo(DataType.FLOAT));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStdX(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {11.10, 22.20, 33.30, 44.40, 55.50, 66.60, 77.70, 88.80, 99.90,
                 111.00, 122.10, 133.20, 144.30, 155.40, 166.50, 177.60, 188.70, 199.80, 210.90, 222.00, 233.10,
@@ -243,9 +240,8 @@ public class PreProcessor3D4DTest extends BaseNd4jTestWithBackends {
         assertEquals(301.22601, templateStd, 0.01);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBruteForce4d(Nd4jBackend backend) {
         Construct4dDataSet imageDataSet = new Construct4dDataSet(10, 5, 10, 15);
 
@@ -270,16 +266,14 @@ public class PreProcessor3D4DTest extends BaseNd4jTestWithBackends {
         myNormalizer.transform(copyDataSet);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test3dRevertStandardize(Nd4jBackend backend) {
         test3dRevert(new NormalizerStandardize());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test3dRevertNormalize(Nd4jBackend backend) {
         test3dRevert(new NormalizerMinMaxScaler());
     }
@@ -299,9 +293,8 @@ public class PreProcessor3D4DTest extends BaseNd4jTestWithBackends {
         assertEquals(dataCopy.getLabels(), data.getLabels());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test3dNinMaxScaling(Nd4jBackend backend) {
         INDArray values = Nd4j.linspace(-10, 10, 100).reshape(5, 2, 10);
         DataSet data = new DataSet(values, values);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/PreProcessorTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/PreProcessorTests.java
index e6e594dba..d20374a95 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/PreProcessorTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/PreProcessorTests.java
@@ -37,9 +37,8 @@ import static org.junit.jupiter.api.Assertions.*;
 public class PreProcessorTests extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLabelLastTimeStepPreProcessor(Nd4jBackend backend){
 
         INDArray f = Nd4j.rand(DataType.FLOAT, 3, 5, 8);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/StandardScalerTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/StandardScalerTest.java
index 57a393862..9cd11a615 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/StandardScalerTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/StandardScalerTest.java
@@ -35,9 +35,8 @@ import org.nd4j.linalg.factory.Nd4jBackend;
 public class StandardScalerTest extends BaseNd4jTestWithBackends {
 
     @Disabled
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScale(Nd4jBackend backend) {
         StandardScaler scaler = new StandardScaler();
         DataSetIterator iter = new IrisDataSetIterator(10, 150);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/CompositeDataSetPreProcessorTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/CompositeDataSetPreProcessorTest.java
index a6148ad0e..d720d815c 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/CompositeDataSetPreProcessorTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/CompositeDataSetPreProcessorTest.java
@@ -41,7 +41,7 @@ public class CompositeDataSetPreProcessorTest extends BaseNd4jTestWithBackends {
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void when_preConditionsIsNull_expect_NullPointerException(Nd4jBackend backend) {
         assertThrows(NullPointerException.class,() -> {
             // Assemble
@@ -54,9 +54,8 @@ public class CompositeDataSetPreProcessorTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void when_dataSetIsEmpty_expect_emptyDataSet(Nd4jBackend backend) {
         // Assemble
         CompositeDataSetPreProcessor sut = new CompositeDataSetPreProcessor();
@@ -69,9 +68,8 @@ public class CompositeDataSetPreProcessorTest extends BaseNd4jTestWithBackends {
         assertTrue(ds.isEmpty());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void when_notStoppingOnEmptyDataSet_expect_allPreProcessorsCalled(Nd4jBackend backend) {
         // Assemble
         TestDataSetPreProcessor preProcessor1 = new TestDataSetPreProcessor(true);
@@ -87,9 +85,8 @@ public class CompositeDataSetPreProcessorTest extends BaseNd4jTestWithBackends {
         assertTrue(preProcessor2.hasBeenCalled);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void when_stoppingOnEmptyDataSetAndFirstPreProcessorClearDS_expect_firstPreProcessorsCalled(Nd4jBackend backend) {
         // Assemble
         TestDataSetPreProcessor preProcessor1 = new TestDataSetPreProcessor(true);
@@ -105,9 +102,8 @@ public class CompositeDataSetPreProcessorTest extends BaseNd4jTestWithBackends {
         assertFalse(preProcessor2.hasBeenCalled);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void when_stoppingOnEmptyDataSet_expect_firstPreProcessorsCalled(Nd4jBackend backend) {
         // Assemble
         TestDataSetPreProcessor preProcessor1 = new TestDataSetPreProcessor(false);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/CropAndResizeDataSetPreProcessorTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/CropAndResizeDataSetPreProcessorTest.java
index 6c7e769a8..923a8f7ee 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/CropAndResizeDataSetPreProcessorTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/CropAndResizeDataSetPreProcessorTest.java
@@ -43,7 +43,7 @@ public class CropAndResizeDataSetPreProcessorTest extends BaseNd4jTestWithBacken
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void when_originalHeightIsZero_expect_IllegalArgumentException(Nd4jBackend backend) {
        assertThrows(IllegalArgumentException.class,() -> {
            CropAndResizeDataSetPreProcessor sut = new CropAndResizeDataSetPreProcessor(0, 15, 5, 5, 4, 3, 3, CropAndResizeDataSetPreProcessor.ResizeMethod.NearestNeighbor);
@@ -53,7 +53,7 @@ public class CropAndResizeDataSetPreProcessorTest extends BaseNd4jTestWithBacken
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void when_originalWidthIsZero_expect_IllegalArgumentException(Nd4jBackend backend) {
         assertThrows(IllegalArgumentException.class,() -> {
             CropAndResizeDataSetPreProcessor sut = new CropAndResizeDataSetPreProcessor(10, 0, 5, 5, 4, 3, 3, CropAndResizeDataSetPreProcessor.ResizeMethod.NearestNeighbor);
@@ -63,7 +63,7 @@ public class CropAndResizeDataSetPreProcessorTest extends BaseNd4jTestWithBacken
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void when_yStartIsNegative_expect_IllegalArgumentException(Nd4jBackend backend) {
         assertThrows(IllegalArgumentException.class,() -> {
             CropAndResizeDataSetPreProcessor sut = new CropAndResizeDataSetPreProcessor(10, 15, -1, 5, 4, 3, 3, CropAndResizeDataSetPreProcessor.ResizeMethod.NearestNeighbor);
@@ -73,7 +73,7 @@ public class CropAndResizeDataSetPreProcessorTest extends BaseNd4jTestWithBacken
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void when_xStartIsNegative_expect_IllegalArgumentException(Nd4jBackend backend) {
         assertThrows(IllegalArgumentException.class,() -> {
             CropAndResizeDataSetPreProcessor sut = new CropAndResizeDataSetPreProcessor(10, 15, 5, -1, 4, 3, 3, CropAndResizeDataSetPreProcessor.ResizeMethod.NearestNeighbor);
@@ -83,7 +83,7 @@ public class CropAndResizeDataSetPreProcessorTest extends BaseNd4jTestWithBacken
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void when_heightIsNotGreaterThanZero_expect_IllegalArgumentException(Nd4jBackend backend) {
         assertThrows(IllegalArgumentException.class,() -> {
             CropAndResizeDataSetPreProcessor sut = new CropAndResizeDataSetPreProcessor(10, 15, 5, 5, 0, 3, 3, CropAndResizeDataSetPreProcessor.ResizeMethod.NearestNeighbor);
@@ -93,7 +93,7 @@ public class CropAndResizeDataSetPreProcessorTest extends BaseNd4jTestWithBacken
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void when_widthIsNotGreaterThanZero_expect_IllegalArgumentException(Nd4jBackend backend) {
         assertThrows(IllegalArgumentException.class,() -> {
             CropAndResizeDataSetPreProcessor sut = new CropAndResizeDataSetPreProcessor(10, 15, 5, 5, 4, 0, 3, CropAndResizeDataSetPreProcessor.ResizeMethod.NearestNeighbor);
@@ -103,7 +103,7 @@ public class CropAndResizeDataSetPreProcessorTest extends BaseNd4jTestWithBacken
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void when_numChannelsIsNotGreaterThanZero_expect_IllegalArgumentException(Nd4jBackend backend) {
         assertThrows(IllegalArgumentException.class,() -> {
             CropAndResizeDataSetPreProcessor sut = new CropAndResizeDataSetPreProcessor(10, 15, 5, 5, 4, 3, 0, CropAndResizeDataSetPreProcessor.ResizeMethod.NearestNeighbor);
@@ -113,7 +113,7 @@ public class CropAndResizeDataSetPreProcessorTest extends BaseNd4jTestWithBacken
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void when_dataSetIsNull_expect_NullPointerException(Nd4jBackend backend) {
         // Assemble
         assertThrows(NullPointerException.class,() -> {
@@ -125,9 +125,8 @@ public class CropAndResizeDataSetPreProcessorTest extends BaseNd4jTestWithBacken
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void when_dataSetIsEmpty_expect_emptyDataSet(Nd4jBackend backend) {
         // Assemble
         CropAndResizeDataSetPreProcessor sut = new CropAndResizeDataSetPreProcessor(10, 15, 5, 5, 4, 3, 3, CropAndResizeDataSetPreProcessor.ResizeMethod.NearestNeighbor);
@@ -140,9 +139,8 @@ public class CropAndResizeDataSetPreProcessorTest extends BaseNd4jTestWithBacken
         assertTrue(ds.isEmpty());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void when_dataSetIs15wx10h_expect_3wx4hDataSet(Nd4jBackend backend) {
         // Assemble
         int numChannels = 3;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/MinMaxStrategyTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/MinMaxStrategyTest.java
index c8bfcb593..17cdc05f4 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/MinMaxStrategyTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/MinMaxStrategyTest.java
@@ -37,9 +37,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class MinMaxStrategyTest extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRowVector() {
         MinMaxStrategy SUT = new MinMaxStrategy(0, 1);
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/PermuteDataSetPreProcessorTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/PermuteDataSetPreProcessorTest.java
index 9485f5bcd..4cb743883 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/PermuteDataSetPreProcessorTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/PermuteDataSetPreProcessorTest.java
@@ -51,9 +51,8 @@ public class PermuteDataSetPreProcessorTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void when_emptyDatasetInInputdataSetIsNCHW_expect_emptyDataSet(Nd4jBackend backend) {
         // Assemble
         PermuteDataSetPreProcessor sut = new PermuteDataSetPreProcessor(PermuteDataSetPreProcessor.PermutationTypes.NCHWtoNHWC);
@@ -66,9 +65,8 @@ public class PermuteDataSetPreProcessorTest extends BaseNd4jTestWithBackends {
         assertTrue(ds.isEmpty());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void when_dataSetIsNCHW_expect_dataSetTransformedToNHWC(Nd4jBackend backend) {
         // Assemble
         int numChannels = 3;
@@ -113,9 +111,8 @@ public class PermuteDataSetPreProcessorTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void when_dataSetIsNHWC_expect_dataSetTransformedToNCHW(Nd4jBackend backend) {
         // Assemble
         int numChannels = 3;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/RGBtoGrayscaleDataSetPreProcessorTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/RGBtoGrayscaleDataSetPreProcessorTest.java
index 1a2be9f7c..071bcfb85 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/RGBtoGrayscaleDataSetPreProcessorTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/RGBtoGrayscaleDataSetPreProcessorTest.java
@@ -51,9 +51,8 @@ public class RGBtoGrayscaleDataSetPreProcessorTest extends BaseNd4jTestWithBacke
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void when_dataSetIsEmpty_expect_EmptyDataSet(Nd4jBackend backend) {
         // Assemble
         RGBtoGrayscaleDataSetPreProcessor sut = new RGBtoGrayscaleDataSetPreProcessor();
@@ -66,9 +65,8 @@ public class RGBtoGrayscaleDataSetPreProcessorTest extends BaseNd4jTestWithBacke
         assertTrue(ds.isEmpty());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void when_colorsAreConverted_expect_grayScaleResult(Nd4jBackend backend) {
         // Assign
         int numChannels = 3;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/UnderSamplingPreProcessorTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/UnderSamplingPreProcessorTest.java
index 84e1353db..ab63f40c3 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/UnderSamplingPreProcessorTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dataset/api/preprocessor/UnderSamplingPreProcessorTest.java
@@ -60,9 +60,8 @@ public class UnderSamplingPreProcessorTest extends BaseNd4jTestWithBackends {
     double tolerancePerc = 0.03; //10% +/- because this is not a very large sample
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void allMajority(Nd4jBackend backend) {
         float[] someTargets = new float[] {0.01f, 0.1f, 0.5f};
         DataSet d = allMajorityDataSet(false);
@@ -87,9 +86,8 @@ public class UnderSamplingPreProcessorTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void allMinority(Nd4jBackend backend) {
         float[] someTargets = new float[] {0.01f, 0.1f, 0.5f};
         DataSet d = allMinorityDataSet(false);
@@ -117,9 +115,8 @@ public class UnderSamplingPreProcessorTest extends BaseNd4jTestWithBackends {
         Different distribution of labels within a minibatch, different time series length within a minibatch
         Checks distribution of classes after preprocessing
      */
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void mixedDist(Nd4jBackend backend) {
 
         UnderSamplingByMaskingPreProcessor preProcessor = new UnderSamplingByMaskingPreProcessor(targetDist, window);
@@ -176,9 +173,8 @@ public class UnderSamplingPreProcessorTest extends BaseNd4jTestWithBackends {
         Same as above but with one hot vectors instead of label size = 1
         Also checks minority override
     */
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void mixedDistOneHot(Nd4jBackend backend) {
 
         //preprocessor should give 30% minority class for every "window"
@@ -238,9 +234,8 @@ public class UnderSamplingPreProcessorTest extends BaseNd4jTestWithBackends {
     }
 
     //all the tests above into one multidataset
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testForMultiDataSet(Nd4jBackend backend) {
         DataSet dataSetA = knownDistVariedDataSet(new float[] {0.8f, 0.1f, 0.2f}, false);
         DataSet dataSetB = knownDistVariedDataSet(new float[] {0.2f, 0.9f, 0.8f}, true);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dimensionalityreduction/TestPCA.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dimensionalityreduction/TestPCA.java
index aeb3db361..091724474 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dimensionalityreduction/TestPCA.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dimensionalityreduction/TestPCA.java
@@ -36,9 +36,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TestPCA extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFactorDims(Nd4jBackend backend) {
         int m = 13;
         int n = 4;
@@ -61,9 +60,8 @@ public class TestPCA extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFactorSVDTransposed(Nd4jBackend backend) {
         int m = 4;
         int n = 13;
@@ -86,9 +84,8 @@ public class TestPCA extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFactorVariance(Nd4jBackend backend) {
         int m = 13;
         int n = 4;
@@ -117,9 +114,8 @@ public class TestPCA extends BaseNd4jTestWithBackends {
     /**
      * Test new PCA routines, added by Luke Czapla
      */
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPCA(Nd4jBackend backend) {
         INDArray m = Nd4j.randn(10000, 16);
         // 10000 random correlated samples of 16 features to analyze
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dimensionalityreduction/TestRandomProjection.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dimensionalityreduction/TestRandomProjection.java
index 534e03f50..eeccdda1d 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dimensionalityreduction/TestRandomProjection.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/dimensionalityreduction/TestRandomProjection.java
@@ -47,9 +47,8 @@ public class TestRandomProjection extends BaseNd4jTestWithBackends {
     INDArray z1 = Nd4j.createUninitialized(new int[]{(int)1e6, 1000});
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testJohnsonLindenStraussDim(Nd4jBackend backend) {
         assertEquals(663, (int)johnsonLindenStraussMinDim((int) 1e6, 0.5).get(0));
         assertTrue(johnsonLindenStraussMinDim((int) 1e6, 0.5).equals(new ArrayList<Integer>(Arrays.asList(663))));
@@ -62,9 +61,8 @@ public class TestRandomProjection extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTargetShape(Nd4jBackend backend) {
         assertArrayEquals(targetShape(z1, 0.5), new long[]{1000, 663});
         assertArrayEquals(targetShape(Nd4j.createUninitialized(new int[]{(int)1e2, 225}), 0.5), new long[]{225, 221});
@@ -72,9 +70,8 @@ public class TestRandomProjection extends BaseNd4jTestWithBackends {
         assertArrayEquals(targetShape(z1, 700), new long[]{1000, 700});
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTargetEpsilonChecks(Nd4jBackend backend) {
         assertThrows(IllegalArgumentException.class,() -> {
             // wrong rel. error
@@ -83,9 +80,8 @@ public class TestRandomProjection extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTargetShapeTooHigh(Nd4jBackend backend) {
         assertThrows(ND4JIllegalStateException.class,() -> {
             // original dimension too small
@@ -101,9 +97,8 @@ public class TestRandomProjection extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicEmbedding(Nd4jBackend backend) {
         INDArray z1 = Nd4j.randn(10000, 500);
         RandomProjection rp = new RandomProjection(0.5);
@@ -112,9 +107,8 @@ public class TestRandomProjection extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{10000, 442}, z2.shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmbedding(Nd4jBackend backend) {
         INDArray z1 = Nd4j.randn(2000, 400);
         INDArray z2 = z1.dup();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/factory/Nd4jTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/factory/Nd4jTest.java
index 44abcf6b3..518bd19ca 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/factory/Nd4jTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/factory/Nd4jTest.java
@@ -53,9 +53,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class Nd4jTest extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRandShapeAndRNG(Nd4jBackend backend) {
         INDArray ret = Nd4j.rand(new int[] {4, 2}, Nd4j.getRandomFactory().getNewRandomInstance(123));
         INDArray ret2 = Nd4j.rand(new int[] {4, 2}, Nd4j.getRandomFactory().getNewRandomInstance(123));
@@ -63,27 +62,24 @@ public class Nd4jTest extends BaseNd4jTestWithBackends {
         assertEquals(ret, ret2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRandShapeAndMinMax(Nd4jBackend backend) {
         INDArray ret = Nd4j.rand(new int[] {4, 2}, -0.125f, 0.125f, Nd4j.getRandomFactory().getNewRandomInstance(123));
         INDArray ret2 = Nd4j.rand(new int[] {4, 2}, -0.125f, 0.125f, Nd4j.getRandomFactory().getNewRandomInstance(123));
         assertEquals(ret, ret2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCreateShape(Nd4jBackend backend) {
         INDArray ret = Nd4j.create(new int[] {4, 2});
 
         assertEquals(ret.length(), 8);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCreateFromList(Nd4jBackend backend) {
         List<Double> doubles = Arrays.asList(1.0, 2.0);
         INDArray NdarrayDobules = Nd4j.create(doubles);
@@ -97,9 +93,8 @@ public class Nd4jTest extends BaseNd4jTestWithBackends {
         assertEquals((Float)NdarrayFloats.getFloat(1),floats.get(1));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetRandom(Nd4jBackend backend) {
         Random r = Nd4j.getRandom();
         Random t = Nd4j.getRandom();
@@ -107,9 +102,8 @@ public class Nd4jTest extends BaseNd4jTestWithBackends {
         assertEquals(r, t);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetRandomSetSeed(Nd4jBackend backend) {
         Random r = Nd4j.getRandom();
         Random t = Nd4j.getRandom();
@@ -119,9 +113,8 @@ public class Nd4jTest extends BaseNd4jTestWithBackends {
         assertEquals(r, t);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOrdering(Nd4jBackend backend) {
         INDArray fNDArray = Nd4j.create(new float[] {1f}, NDArrayFactory.FORTRAN);
         assertEquals(NDArrayFactory.FORTRAN, fNDArray.ordering());
@@ -135,9 +128,8 @@ public class Nd4jTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMean(Nd4jBackend backend) {
         INDArray data = Nd4j.create(new double[] {4., 4., 4., 4., 8., 8., 8., 8., 4., 4., 4., 4., 8., 8., 8., 8., 4.,
                         4., 4., 4., 8., 8., 8., 8., 4., 4., 4., 4., 8., 8., 8., 8, 2., 2., 2., 2., 4., 4., 4., 4., 2.,
@@ -151,9 +143,8 @@ public class Nd4jTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVar(Nd4jBackend backend) {
         INDArray data = Nd4j.create(new double[] {4., 4., 4., 4., 8., 8., 8., 8., 4., 4., 4., 4., 8., 8., 8., 8., 4.,
                         4., 4., 4., 8., 8., 8., 8., 4., 4., 4., 4., 8., 8., 8., 8, 2., 2., 2., 2., 4., 4., 4., 4., 2.,
@@ -166,18 +157,16 @@ public class Nd4jTest extends BaseNd4jTestWithBackends {
         assertEquals(expectedResult, actualResult,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVar2(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(2, 3);
         INDArray var = arr.var(false, 0);
         assertEquals(Nd4j.create(new double[] {2.25, 2.25, 2.25}), var);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testExpandDims(){
         final List<Pair<INDArray, String>> testMatricesC = NDArrayCreationUtil.getAllTestMatricesWithShape('c', 3, 5, 0xDEAD, DataType.DOUBLE);
         final List<Pair<INDArray, String>> testMatricesF = NDArrayCreationUtil.getAllTestMatricesWithShape('f', 7, 11, 0xBEEF, DataType.DOUBLE);
@@ -207,9 +196,8 @@ public class Nd4jTest extends BaseNd4jTestWithBackends {
             }
         }
     }
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSqueeze(){
         final List<Pair<INDArray, String>> testMatricesC = NDArrayCreationUtil.getAllTestMatricesWithShape('c', 3, 1, 0xDEAD, DataType.DOUBLE);
         final List<Pair<INDArray, String>> testMatricesF = NDArrayCreationUtil.getAllTestMatricesWithShape('f', 7, 1, 0xBEEF, DataType.DOUBLE);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/factory/ops/NDBaseTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/factory/ops/NDBaseTest.java
index 7421cc794..b03ba2b12 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/factory/ops/NDBaseTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/factory/ops/NDBaseTest.java
@@ -41,9 +41,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
 
     // TODO: Comment from the review. We'll remove the new NDBase() at some point.
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAll(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.zeros(DataType.BOOL, 3, 3);
@@ -52,9 +51,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAny(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.eye(3).castTo(DataType.BOOL);
@@ -63,9 +61,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArgmax(Nd4jBackend backend) {
         NDBase base = new NDBase();
 
@@ -82,9 +79,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArgmin(Nd4jBackend backend) {
         //Copy Paste from argmax, replaced with argmin.
         NDBase base = new NDBase();
@@ -102,9 +98,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcat(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.zeros(DataType.DOUBLE, 3, 3);
@@ -117,9 +112,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{3, 6}, z.shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCumprod(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 9).reshape(3, 3);
@@ -133,9 +127,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCumsum(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 9).reshape(3, 3);
@@ -148,9 +141,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDot(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 3);
@@ -159,9 +151,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDynamicpartition(Nd4jBackend backend) {
         //Try to execute the sample in the code dcumentation:
         NDBase base = new NDBase();
@@ -173,9 +164,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDynamicStitch(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 9).reshape(3, 3);
@@ -183,9 +173,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         //TODO: crashes here. Op needs fixing.  Bad constructor, as previously flagged. Both input and indices need to be INDArrays
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarEq(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.zeros(DataType.DOUBLE, 3, 3);
@@ -194,9 +183,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEq(Nd4jBackend backend) {
         //element wise  eq.
         NDBase base = new NDBase();
@@ -206,9 +194,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testExpandDims(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.createFromArray(1,2).reshape(1,2);
@@ -217,9 +204,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFill(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.createFromArray(2, 2);
@@ -228,9 +214,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGather(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.zeros(DataType.DOUBLE, 3, 3);
@@ -240,9 +225,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarGt(Nd4jBackend backend) {
         //Scalar gt.
         NDBase base = new NDBase();
@@ -252,9 +236,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGt(Nd4jBackend backend) {
         //element wise  gt.
         NDBase base = new NDBase();
@@ -266,9 +249,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarGte(Nd4jBackend backend) {
         //Scalar gte.
         NDBase base = new NDBase();
@@ -278,9 +260,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGte(Nd4jBackend backend) {
         //element wise  gte.
         NDBase base = new NDBase();
@@ -291,9 +272,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIdentity(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.zeros(DataType.DOUBLE, 3, 3);
@@ -301,9 +281,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(x, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInvertPermutation(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.createFromArray(2,0,1);
@@ -312,9 +291,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testisNumericTensor(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.zeros(DataType.DOUBLE, 3, 3);
@@ -322,18 +300,16 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.scalar(true), y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLinspace(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray y = base.linspace(DataType.DOUBLE, 0.0, 9.0, 19);
         //TODO: test crashes.
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarLt(Nd4jBackend backend) {
         //Scalar lt.
         NDBase base = new NDBase();
@@ -343,9 +319,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLt(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x1 = Nd4j.zeros(DataType.DOUBLE, 3, 3);
@@ -355,9 +330,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarLte(Nd4jBackend backend) {
         //Scalar gt.
         NDBase base = new NDBase();
@@ -367,9 +341,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLte(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x1 = Nd4j.zeros(DataType.DOUBLE, 3, 3);
@@ -379,9 +352,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatchCondition(Nd4jBackend backend) {
         // same test as TestMatchTransformOp,
         NDBase base = new NDBase();
@@ -391,9 +363,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatchConditionCount(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.createFromArray(1.0, 1.0, 1.0, 0.0, 1.0, 1.0);
@@ -417,9 +388,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMax(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.eye(3).castTo(DataType.FLOAT);
@@ -432,9 +402,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMean(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.eye(3).castTo(DataType.FLOAT);
@@ -447,9 +416,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMin(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.eye(3).castTo(DataType.FLOAT);
@@ -462,9 +430,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmulTranspose(Nd4jBackend backend) {
         INDArray x = Nd4j.rand(DataType.FLOAT, 4, 3);
         INDArray y = Nd4j.rand(DataType.FLOAT, 5, 4);
@@ -473,9 +440,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(exp, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmul(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 9).reshape(3, 3);
@@ -484,9 +450,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y, x);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarNeq(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.zeros(DataType.DOUBLE, 3, 3);
@@ -495,9 +460,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNeq(Nd4jBackend backend) {
         //element wise  eq.
         NDBase base = new NDBase();
@@ -508,9 +472,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNorm1(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.eye(3).castTo(DataType.FLOAT);
@@ -523,9 +486,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNorm2(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.eye(3).castTo(DataType.FLOAT);
@@ -538,9 +500,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNormMax(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.eye(3).castTo(DataType.FLOAT);
@@ -553,9 +514,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOneHot(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.createFromArray(0.0, 1.0, 2.0);
@@ -572,9 +532,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y); //TODO: Looks like we're getting back the wrong datatype.       https://github.com/eclipse/deeplearning4j/issues/8607
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOnesLike(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.createFromArray(3, 3);
@@ -587,9 +546,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y); //TODO: Getting back a double array, not a long.    https://github.com/eclipse/deeplearning4j/issues/8605
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPermute(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(1, 6, 6).reshape(2, 3);
@@ -597,9 +555,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{3, 2}, y.shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testProd(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.eye(3).castTo(DataType.FLOAT);
@@ -612,9 +569,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRange(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray y = base.range(0.0, 3.0, 1.0, DataType.DOUBLE);
@@ -622,9 +578,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y); //TODO: Asked for DOUBLE, got back a FLOAT Array.   https://github.com/eclipse/deeplearning4j/issues/8606
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRank(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.eye(3);
@@ -635,9 +590,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
     }
 
     /*
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRepeat(Nd4jBackend backend) {
         fail("AB 2020/01/09 - Not sure what this op is supposed to do...");
         NDBase base = new NDBase();
@@ -648,9 +602,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
      */
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReplaceWhere(Nd4jBackend backend) {
         // test from BooleanIndexingTest.
         NDBase base = new NDBase();
@@ -662,9 +615,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReshape(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 9).reshape(3, 3);
@@ -674,9 +626,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReverse(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 6).reshape(2, 3);
@@ -685,9 +636,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReverseSequence(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 9).reshape(3,3);
@@ -702,9 +652,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarFloorMod(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 9).reshape(3, 3);
@@ -713,9 +662,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarMax(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 9).reshape(3, 3);
@@ -725,9 +673,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         //System.out.println(y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarMin(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 9).reshape(3, 3);
@@ -736,9 +683,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarSet(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.createFromArray(1.0, 2.0, 0.0, 4.0, 5.0);
@@ -747,9 +693,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScatterAdd(Nd4jBackend backend) {
         NDBase base = new NDBase();
 
@@ -764,9 +709,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScatterDiv(Nd4jBackend backend) {
         NDBase base = new NDBase();
 
@@ -781,9 +725,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScatterMax(Nd4jBackend backend) {
         NDBase base = new NDBase();
 
@@ -798,9 +741,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScatterMin(Nd4jBackend backend) {
         NDBase base = new NDBase();
 
@@ -815,9 +757,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScatterMul(Nd4jBackend backend) {
         NDBase base = new NDBase();
 
@@ -832,9 +773,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScatterSub(Nd4jBackend backend) {
         NDBase base = new NDBase();
 
@@ -851,9 +791,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSegmentMax(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.createFromArray(3, 6, 1, 4, 9,2, 2);
@@ -863,9 +802,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSegmentMean(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.createFromArray(3.0, 6.0, 1.0, 4.0, 9.0,2.0, 2.0);
@@ -875,9 +813,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSegmentMin(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.createFromArray(3.0, 6.0, 1.0, 4.0, 9.0,2.0, 2.0);
@@ -887,9 +824,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSegmentProd(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.createFromArray(3.0, 6.0, 1.0, 4.0, 9.0,2.0, 2.0);
@@ -899,9 +835,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSegmentSum(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.createFromArray(3.0, 6.0, 1.0, 4.0, 9.0,2.0, 2.0);
@@ -911,9 +846,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSequenceMask(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray length = Nd4j.createFromArray(1, 3, 2);
@@ -928,9 +862,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testShape(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.zeros(3,3);
@@ -939,9 +872,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSize(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.zeros(3,3);
@@ -949,9 +881,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.scalar(9L), y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSizeAt(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.zeros(10,20, 30);
@@ -959,9 +890,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.scalar(20L), y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSlice(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 6).reshape(2, 3);
@@ -970,9 +900,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSquaredNorm(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 9).reshape(3, 3);
@@ -985,9 +914,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSqueeze(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 10).reshape(2,1,5);
@@ -996,9 +924,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStack(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 3);
@@ -1006,9 +933,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         // TODO: Op definition looks wrong. Compare stack in Nd4j.
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStandardDeviation(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 4);
@@ -1021,9 +947,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStridedSlice(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 9).reshape(3,3);
@@ -1033,9 +958,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSum(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 9).reshape(3,3);
@@ -1047,9 +971,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp.reshape(1,3), y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTensorMul(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 9).reshape(3,3);
@@ -1067,9 +990,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(exp, res);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTile(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 4).reshape(2,2);
@@ -1083,9 +1005,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTranspose(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 9).reshape(3,3);
@@ -1094,9 +1015,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUnsegmentMax(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.createFromArray(1,3,2,6,4,9,8);
@@ -1106,9 +1026,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUnsegmentMean(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.createFromArray(1,3,2,6,4,9,8).castTo(DataType.FLOAT);
@@ -1118,9 +1037,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUnsegmentedMin(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.createFromArray(1,3,2,6,4,9,8);
@@ -1130,9 +1048,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUnsegmentProd(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.createFromArray(1,3,2,6,4,9,8);
@@ -1142,9 +1059,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUnsortedSegmentSqrtN(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.createFromArray(1.0,3.0,2.0,6.0,4.0,9.0,8.0);
@@ -1154,9 +1070,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUnsortedSegmentSum(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.createFromArray(1,3,2,6,4,9,8);
@@ -1166,9 +1081,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVariance(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 4);
@@ -1181,9 +1095,8 @@ public class NDBaseTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testZerosLike(Nd4jBackend backend) {
         NDBase base = new NDBase();
         INDArray x = Nd4j.zeros(3,3);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/factory/ops/NDLossTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/factory/ops/NDLossTest.java
index d95c4503f..a0b021ff2 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/factory/ops/NDLossTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/factory/ops/NDLossTest.java
@@ -43,9 +43,8 @@ public class NDLossTest extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAbsoluteDifference(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -79,9 +78,8 @@ public class NDLossTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp2, y2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCosineDistance(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -117,9 +115,8 @@ public class NDLossTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp2, y2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testHingeLoss(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -152,9 +149,8 @@ public class NDLossTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp2, y2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testHuberLoss(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -187,9 +183,8 @@ public class NDLossTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp2, y2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testL2Loss(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -207,9 +202,8 @@ public class NDLossTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLogLoss(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -247,9 +241,8 @@ public class NDLossTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp2, y2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLogPoisson(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -282,9 +275,8 @@ public class NDLossTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp2, y2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMeanPairwiseSquaredError(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -318,9 +310,8 @@ public class NDLossTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp2, y2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMeanSquaredError(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -354,9 +345,8 @@ public class NDLossTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp2, y2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSigmoidCrossEntropy(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -391,9 +381,8 @@ public class NDLossTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp2, y2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSoftmaxCrossEntropy(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -430,9 +419,8 @@ public class NDLossTest extends BaseNd4jTestWithBackends {
         assertEquals(y_exp2, y2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSparseSoftmaxCrossEntropy(Nd4jBackend backend) {
         SameDiff sd = SameDiff.create();
 
@@ -459,9 +447,8 @@ public class NDLossTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWeightedCrossEntropyWithLogits(Nd4jBackend backend) {
         // This one from SamediffTests.java
         SameDiff sameDiff = SameDiff.create();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/generated/SDLinalgTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/generated/SDLinalgTest.java
index 974784882..3ac390087 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/generated/SDLinalgTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/generated/SDLinalgTest.java
@@ -48,9 +48,8 @@ public class SDLinalgTest extends BaseNd4jTestWithBackends {
         sameDiff = SameDiff.create();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCholesky(Nd4jBackend backend) {
         INDArray input = Nd4j.createFromArray(
                 new float[]{
@@ -73,9 +72,8 @@ public class SDLinalgTest extends BaseNd4jTestWithBackends {
         assertEquals(expected, out.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLstsq() {
         INDArray a = Nd4j.createFromArray(new float[]{
                 1.f,    2.f,    3.f, 4.f,
@@ -97,9 +95,8 @@ public class SDLinalgTest extends BaseNd4jTestWithBackends {
         assertEquals(expected, res.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLu() {
         SDVariable sdInput = sameDiff.var(Nd4j.createFromArray(new double[]{
                 1., 2., 3., 0., 2., 3., 0., 0., 7.
@@ -113,9 +110,8 @@ public class SDLinalgTest extends BaseNd4jTestWithBackends {
         assertEquals(expected, out.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatrixBandPart() {
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 2*3*3).reshape(2,3,3);
         INDArray expected = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 2*3*3).reshape(2,3,3);
@@ -125,9 +121,8 @@ public class SDLinalgTest extends BaseNd4jTestWithBackends {
         assertArrayEquals(x.shape(), res[0].eval().shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testQr() {
         INDArray input = Nd4j.createFromArray(new double[]{
                 12.,  -51.,    4.,
@@ -159,9 +154,8 @@ public class SDLinalgTest extends BaseNd4jTestWithBackends {
         assertEquals(input, mmulResult.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSolve() {
         INDArray a = Nd4j.createFromArray(new float[] {
                 2.f, -1.f, -2.f, -4.f, 6.f, 3.f, -4.f, -2.f, 8.f
@@ -182,9 +176,8 @@ public class SDLinalgTest extends BaseNd4jTestWithBackends {
         assertEquals(expected, res.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTriangularSolve() {
         INDArray a = Nd4j.createFromArray(new float[] {
                 0.7788f,    0.8012f,    0.7244f,
@@ -211,9 +204,8 @@ public class SDLinalgTest extends BaseNd4jTestWithBackends {
         assertEquals(expected, res.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCross() {
         INDArray a = Nd4j.createFromArray(new double[]{1, 2, 3});
         INDArray b = Nd4j.createFromArray(new double[]{6, 7, 8});
@@ -226,9 +218,8 @@ public class SDLinalgTest extends BaseNd4jTestWithBackends {
         assertEquals(expected, res.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDiag() {
         INDArray x = Nd4j.createFromArray(new double[]{1,2});
         INDArray expected = Nd4j.createFromArray(new double[]{1,0,0,2}).reshape(2,2);
@@ -239,9 +230,8 @@ public class SDLinalgTest extends BaseNd4jTestWithBackends {
         assertEquals(expected, res.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDiagPart() {
         INDArray x = Nd4j.linspace(DataType.DOUBLE, 1.0, 1.0, 4).reshape(2,2);
         INDArray expected = Nd4j.createFromArray(new double[]{1,4});
@@ -252,9 +242,8 @@ public class SDLinalgTest extends BaseNd4jTestWithBackends {
         assertEquals(expected, res.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLogdet() {
         INDArray x = Nd4j.createFromArray(new double[]{
                 4,12,-16,12,37,-43,-16,-43,98, 4,1.2,-1.6,1.2,3.7,-4.3,-1.6,-4.3,9.8
@@ -267,9 +256,8 @@ public class SDLinalgTest extends BaseNd4jTestWithBackends {
         assertEquals(expected, res.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSvd() {
         INDArray x = Nd4j.createFromArray(new double[]{
                 0.7787856f, 0.80119777f, 0.72437465f, 0.23089433f, 0.72714126f, 0.18039072f,0.50563407f, 0.89252293f, 0.5461209f
@@ -281,9 +269,8 @@ public class SDLinalgTest extends BaseNd4jTestWithBackends {
         assertEquals(expected, res.eval());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLogdetName() {
         INDArray x = Nd4j.createFromArray(new double[]{
                 4,12,-16,12,37,-43,-16,-43,98, 4,1.2,-1.6,1.2,3.7,-4.3,-1.6,-4.3,9.8
@@ -295,9 +282,8 @@ public class SDLinalgTest extends BaseNd4jTestWithBackends {
         assertEquals("logdet", res.name());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testQrNames() {
         INDArray input = Nd4j.createFromArray(new double[]{
                 12.,  -51.,    4.,
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/indexing/BooleanIndexingTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/indexing/BooleanIndexingTest.java
index a8c66f4e7..89cff5fdc 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/indexing/BooleanIndexingTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/indexing/BooleanIndexingTest.java
@@ -50,90 +50,80 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         1D array checks
      */
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAnd1(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new float[] {1.0f, 2.0f, 3.0f, 4.0f, 5.0f});
 
         assertTrue(BooleanIndexing.and(array, Conditions.greaterThan(0.5f)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAnd2(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new float[] {1.0f, 2.0f, 3.0f, 4.0f, 5.0f});
 
         assertTrue(BooleanIndexing.and(array, Conditions.lessThan(6.0f)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAnd3(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new float[] {1.0f, 2.0f, 3.0f, 4.0f, 5.0f});
 
         assertFalse(BooleanIndexing.and(array, Conditions.lessThan(5.0f)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAnd4(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new float[] {1.0f, 2.0f, 3.0f, 4.0f, 5.0f});
 
         assertFalse(BooleanIndexing.and(array, Conditions.greaterThan(4.0f)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAnd5(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new float[] {1e-5f, 1e-5f, 1e-5f, 1e-5f, 1e-5f});
 
         assertTrue(BooleanIndexing.and(array, Conditions.greaterThanOrEqual(1e-5f)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAnd6(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new float[] {1e-5f, 1e-5f, 1e-5f, 1e-5f, 1e-5f});
 
         assertFalse(BooleanIndexing.and(array, Conditions.lessThan(1e-5f)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAnd7(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new float[] {1e-5f, 1e-5f, 1e-5f, 1e-5f, 1e-5f});
 
         assertTrue(BooleanIndexing.and(array, Conditions.equals(1e-5f)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOr1(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new float[] {1.0f, 2.0f, 3.0f, 4.0f, 5.0f});
 
         assertTrue(BooleanIndexing.or(array, Conditions.greaterThan(3.0f)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOr2(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new float[] {1.0f, 2.0f, 3.0f, 4.0f, 5.0f});
 
         assertTrue(BooleanIndexing.or(array, Conditions.lessThan(3.0f)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOr3(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new float[] {1.0f, 2.0f, 3.0f, 4.0f, 5.0f});
 
@@ -144,18 +134,16 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         2D array checks
      */
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test2dAnd1(Nd4jBackend backend) {
         INDArray array = Nd4j.zeros(10, 10);
 
         assertTrue(BooleanIndexing.and(array, Conditions.equals(0f)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test2dAnd2(Nd4jBackend backend) {
         INDArray array = Nd4j.zeros(10, 10);
         array.slice(4).putScalar(2, 1e-5f);
@@ -166,9 +154,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test2dAnd3(Nd4jBackend backend) {
         INDArray array = Nd4j.zeros(10, 10);
 
@@ -177,9 +164,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertFalse(BooleanIndexing.and(array, Conditions.greaterThan(0f)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test2dAnd4(Nd4jBackend backend) {
         INDArray array = Nd4j.zeros(10, 10);
 
@@ -194,9 +180,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
      *
      * @throws Exception
      */
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSliceAssign1(Nd4jBackend backend) {
         INDArray array = Nd4j.zeros(4, 4);
 
@@ -217,9 +202,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertFalse(BooleanIndexing.and(array, Conditions.equals(0f)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConditionalAssign1(Nd4jBackend backend) {
         INDArray array1 = Nd4j.create(new double[] {1, 2, 3, 4, 5, 6, 7});
         INDArray array2 = Nd4j.create(new double[] {7, 6, 5, 4, 3, 2, 1});
@@ -230,9 +214,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertEquals(comp, array1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCaSTransform1(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {1, 2, 0, 4, 5});
         INDArray comp = Nd4j.create(new double[] {1, 2, 3, 4, 5});
@@ -242,9 +225,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertEquals(comp, array);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCaSTransform2(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {1, 2, 0, 4, 5});
         INDArray comp = Nd4j.create(new double[] {3, 2, 3, 4, 5});
@@ -254,9 +236,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertEquals(comp, array);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCaSPairwiseTransform1(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {1, 2, 0, 4, 5});
         INDArray comp = Nd4j.create(new double[] {1, 2, 3, 4, 5});
@@ -266,9 +247,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertEquals(comp, array);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCaRPairwiseTransform1(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {1, 2, 0, 4, 5});
         INDArray comp = Nd4j.create(new double[] {1, 2, 3, 4, 5});
@@ -278,9 +258,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertEquals(comp, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCaSPairwiseTransform2(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new double[] {1, 2, 0, 4, 5});
         INDArray y = Nd4j.create(new double[] {2, 4, 3, 0, 5});
@@ -291,9 +270,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertEquals(comp, x);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCaRPairwiseTransform2(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new double[] {1, 2, 0, 4, 5});
         INDArray y = Nd4j.create(new double[] {2, 4, 3, 4, 5});
@@ -304,9 +282,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertEquals(comp, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCaSPairwiseTransform3(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new double[] {1, 2, 0, 4, 5});
         INDArray y = Nd4j.create(new double[] {2, 4, 3, 4, 5});
@@ -317,9 +294,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertEquals(comp, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCaRPairwiseTransform3(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new double[] {1, 2, 0, 4, 5});
         INDArray y = Nd4j.create(new double[] {2, 4, 3, 4, 5});
@@ -331,9 +307,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatchConditionAllDimensions1(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
 
@@ -343,9 +318,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertEquals(5, val);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatchConditionAllDimensions2(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {0, 1, 2, 3, Double.NaN, 5, 6, 7, 8, 9});
 
@@ -355,9 +329,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertEquals(1, val);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatchConditionAllDimensions3(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {0, 1, 2, 3, Double.NEGATIVE_INFINITY, 5, 6, 7, 8, 9});
 
@@ -367,9 +340,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertEquals(1, val);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatchConditionAlongDimension1(Nd4jBackend backend) {
         INDArray array = Nd4j.ones(3, 10);
         array.getRow(2).assign(0.0);
@@ -381,9 +353,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertArrayEquals(comp, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatchConditionAlongDimension2(Nd4jBackend backend) {
         INDArray array = Nd4j.ones(3, 10);
         array.getRow(2).assign(0.0).putScalar(0, 1.0);
@@ -397,9 +368,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertArrayEquals(comp, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatchConditionAlongDimension3(Nd4jBackend backend) {
         INDArray array = Nd4j.ones(3, 10);
         array.getRow(2).assign(0.0).putScalar(0, 1.0);
@@ -412,9 +382,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConditionalUpdate(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(-2, 2, 5, DataType.DOUBLE);
         INDArray ones = Nd4j.ones(DataType.DOUBLE, 5);
@@ -427,9 +396,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFirstIndex1(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new double[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 0});
         INDArray result = BooleanIndexing.firstIndex(arr, Conditions.greaterThanOrEqual(3));
@@ -437,9 +405,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertEquals(2, result.getDouble(0), 0.0);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFirstIndex2(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new double[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 0});
         INDArray result = BooleanIndexing.firstIndex(arr, Conditions.lessThan(3));
@@ -447,9 +414,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertEquals(0, result.getDouble(0), 0.0);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLastIndex1(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new double[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 0});
         INDArray result = BooleanIndexing.lastIndex(arr, Conditions.greaterThanOrEqual(3));
@@ -457,9 +423,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertEquals(8, result.getDouble(0), 0.0);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFirstIndex2D(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new double[] {1, 2, 3, 0, 1, 3, 7, 8, 9}).reshape('c', 3, 3);
         INDArray result = BooleanIndexing.firstIndex(arr, Conditions.greaterThanOrEqual(2), 1);
@@ -468,9 +433,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertEquals(exp, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLastIndex2D(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new double[] {1, 2, 3, 0, 1, 3, 7, 8, 0}).reshape('c', 3, 3);
         INDArray result = BooleanIndexing.lastIndex(arr, Conditions.greaterThanOrEqual(2), 1);
@@ -479,9 +443,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertEquals(exp, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEpsEquals1(Nd4jBackend backend) {
         INDArray array = Nd4j.create(new double[] {-1, -1, -1e-8, 1e-8, 1, 1});
         MatchCondition condition = new MatchCondition(array, Conditions.epsEquals(0.0));
@@ -490,9 +453,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertEquals(2, numZeroes);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testChooseNonZero(Nd4jBackend backend) {
         INDArray testArr = Nd4j.create(new double[] {
                 0.00,  0.51,  0.68,  0.69,  0.86,  0.91,  0.96,  0.97,  0.97,  1.03,  1.13,  1.16,  1.16,  1.17,  1.19,  1.25,  1.25,  1.26,  1.27,  1.28,  1.29,  1.29,  1.29,  1.30,  1.31,  1.32,  1.33,  1.33,  1.35,  1.35,  1.36,  1.37,  1.38,  1.40,  1.41,  1.42,  1.43,  1.44,  1.44,  1.45,  1.45,  1.47,  1.47,  1.51,  1.51,  1.51,  1.52,  1.53,  1.56,  1.57,  1.58,  1.59,  1.61,  1.62,  1.63,  1.63,  1.64,  1.64,  1.66,  1.66,  1.67,  1.67,  1.70,  1.70,  1.70,  1.72,  1.72,  1.72,  1.72,  1.73,  1.74,  1.74,  1.76,  1.76,  1.77,  1.77,  1.80,  1.80,  1.81,  1.82,  1.83,  1.83,  1.84,  1.84,  1.84,  1.85,  1.85,  1.85,  1.86,  1.86,  1.87,  1.88,  1.89,  1.89,  1.89,  1.89,  1.89,  1.91,  1.91,  1.91,  1.92,  1.94,  1.95,  1.97,  1.98,  1.98,  1.98,  1.98,  1.98,  1.99,  2.00,  2.00,  2.01,  2.01,  2.02,  2.03,  2.03,  2.03,  2.04,  2.04,  2.05,  2.06,  2.07,  2.08,  2.08,  2.08,  2.08,  2.09,  2.09,  2.10,  2.10,  2.11,  2.11,  2.11,  2.12,  2.12,  2.13,  2.13,  2.14,  2.14,  2.14,  2.14,  2.15,  2.15,  2.16,  2.16,  2.16,  2.16,  2.16,  2.17
@@ -504,9 +466,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testChooseBasic(Nd4jBackend backend) {
         Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.ANY_PANIC);
         NativeOpsHolder.getInstance().getDeviceNativeOps().enableDebugMode(true);
@@ -516,18 +477,16 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testChooseGreaterThanZero(Nd4jBackend backend) {
         INDArray zero = Nd4j.linspace(0,4,4, Nd4j.dataType());
         INDArray filtered = BooleanIndexing.chooseFrom(new INDArray[]{zero},Arrays.asList(0.0), Collections.emptyList(),new GreaterThan());
         assertEquals(3, filtered.length());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testChooseNone(Nd4jBackend backend) {
         Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.ANY_PANIC);
         NativeOpsHolder.getInstance().getDeviceNativeOps().enableDebugMode(true);
@@ -537,9 +496,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWhere(Nd4jBackend backend) {
         INDArray data = Nd4j.create(4);
         INDArray mask = Nd4j.create(DataType.BOOL, 4);
@@ -565,9 +523,8 @@ public class BooleanIndexingTest extends BaseNd4jTestWithBackends {
         assertEquals(assertion,resultData);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEpsStuff_1(Nd4jBackend backend) {
         val dtype = Nd4j.dataType();
         val array = Nd4j.create(new float[]{0.001f, 5e-6f, 5e-6f, 5e-6f, 5e-6f});
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/indexing/TransformsTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/indexing/TransformsTest.java
index 68bc330ed..b37fd1875 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/indexing/TransformsTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/indexing/TransformsTest.java
@@ -42,9 +42,8 @@ public class TransformsTest extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEq1(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new double[] {0, 1, 2, 1});
         INDArray exp = Nd4j.create(new boolean[] {false, false, true, false});
@@ -54,9 +53,8 @@ public class TransformsTest extends BaseNd4jTestWithBackends {
         assertEquals(exp, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNEq1(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new double[] {0, 1, 2, 1});
         INDArray exp = Nd4j.create(new boolean[] {true, false, true, false});
@@ -66,9 +64,8 @@ public class TransformsTest extends BaseNd4jTestWithBackends {
         assertEquals(exp, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLT1(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new double[] {0, 1, 2, 1});
         INDArray exp = Nd4j.create(new boolean[] {true, true, false, true});
@@ -79,9 +76,8 @@ public class TransformsTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGT1(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new double[] {0, 1, 2, 4});
         INDArray exp = Nd4j.create(new boolean[] {false, false, true, true});
@@ -92,9 +88,8 @@ public class TransformsTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarMinMax1(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new double[] {1, 3, 5, 7});
         INDArray xCopy = x.dup();
@@ -117,9 +112,8 @@ public class TransformsTest extends BaseNd4jTestWithBackends {
         assertEquals(exp2, x);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArrayMinMax(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new double[] {1, 3, 5, 7});
         INDArray y = Nd4j.create(new double[] {2, 2, 6, 6});
@@ -152,9 +146,8 @@ public class TransformsTest extends BaseNd4jTestWithBackends {
         assertEquals(yCopy, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAnd1(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new double[] {0, 0, 1, 0, 0});
         INDArray y = Nd4j.create(new double[] {0, 0, 1, 1, 0});
@@ -165,9 +158,8 @@ public class TransformsTest extends BaseNd4jTestWithBackends {
         assertEquals(e, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOr1(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new double[] {0, 0, 1, 0, 0});
         INDArray y = Nd4j.create(new double[] {0, 0, 1, 1, 0});
@@ -178,9 +170,8 @@ public class TransformsTest extends BaseNd4jTestWithBackends {
         assertEquals(e, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testXor1(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new double[] {0, 0, 1, 0, 0});
         INDArray y = Nd4j.create(new double[] {0, 0, 1, 1, 0});
@@ -191,9 +182,8 @@ public class TransformsTest extends BaseNd4jTestWithBackends {
         assertEquals(exp, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNot1(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new double[] {0, 0, 1, 0, 0});
         INDArray exp = Nd4j.create(new boolean[] {false, false, true, false, false});
@@ -203,9 +193,8 @@ public class TransformsTest extends BaseNd4jTestWithBackends {
         assertEquals(exp, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSlice_1(Nd4jBackend backend) {
         val arr = Nd4j.linspace(1,4, 4, DataType.FLOAT).reshape(2, 2, 1);
         val exp0 = Nd4j.create(new float[]{1, 2}, new int[] {2, 1});
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/inverse/TestInvertMatrices.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/inverse/TestInvertMatrices.java
index c326b7890..4589a42a5 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/inverse/TestInvertMatrices.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/inverse/TestInvertMatrices.java
@@ -46,9 +46,8 @@ public class TestInvertMatrices extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInverse(Nd4jBackend backend) {
         RealMatrix matrix = new Array2DRowRealMatrix(new double[][] {{1, 2}, {3, 4}});
 
@@ -61,9 +60,8 @@ public class TestInvertMatrices extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInverseComparison(Nd4jBackend backend) {
 
         List<Pair<INDArray, String>> list = NDArrayCreationUtil.getAllTestMatricesWithShape(10, 10, 12345, DataType.DOUBLE);
@@ -80,9 +78,8 @@ public class TestInvertMatrices extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInvalidMatrixInversion(Nd4jBackend backend) {
         try {
             InvertMatrix.invert(Nd4j.create(5, 4), false);
@@ -103,9 +100,8 @@ public class TestInvertMatrices extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInvertMatrixScalar(){
         INDArray in = Nd4j.valueArrayOf(new int[]{1,1}, 2);
         INDArray out1 = InvertMatrix.invert(in, false);
@@ -120,9 +116,8 @@ public class TestInvertMatrices extends BaseNd4jTestWithBackends {
     /**
      * Example from: <a href="https://www.wolframalpha.com/input/?i=invert+matrix+((1,2),(3,4),(5,6))">here</a>
      */
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLeftPseudoInvert(Nd4jBackend backend) {
         INDArray X = Nd4j.create(new double[][]{{1, 2}, {3, 4}, {5, 6}});
         INDArray expectedLeftInverse = Nd4j.create(new double[][]{{-16, -4, 8}, {13, 4, -5}}).mul(1 / 12d);
@@ -169,9 +164,8 @@ public class TestInvertMatrices extends BaseNd4jTestWithBackends {
     /**
      * Example from: <a href="https://www.wolframalpha.com/input/?i=invert+matrix+((1,2),(3,4),(5,6))^T">here</a>
      */
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRightPseudoInvert(Nd4jBackend backend) {
         INDArray X = Nd4j.create(new double[][]{{1, 2}, {3, 4}, {5, 6}}).transpose();
         INDArray expectedRightInverse = Nd4j.create(new double[][]{{-16, 13}, {-4, 4}, {8, -5}}).mul(1 / 12d);
@@ -200,9 +194,8 @@ public class TestInvertMatrices extends BaseNd4jTestWithBackends {
     /**
      * Try to compute the right pseudo inverse of a matrix without full row rank (x1 = 2*x2)
      */
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRightPseudoInvertWithNonFullRowRank(Nd4jBackend backend) {
         assertThrows(IllegalArgumentException.class,() -> {
             INDArray X = Nd4j.create(new double[][]{{1, 2}, {3, 6}, {5, 10}}).transpose();
@@ -214,9 +207,8 @@ public class TestInvertMatrices extends BaseNd4jTestWithBackends {
     /**
      * Try to compute the left pseudo inverse of a matrix without full column rank (x1 = 2*x2)
      */
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLeftPseudoInvertWithNonFullColumnRank(Nd4jBackend backend) {
         assertThrows(IllegalArgumentException.class,() -> {
             INDArray X = Nd4j.create(new double[][]{{1, 2}, {3, 6}, {5, 10}});
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/lapack/LapackTestsC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/lapack/LapackTestsC.java
index 5f1d0427c..8ab8dd1dc 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/lapack/LapackTestsC.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/lapack/LapackTestsC.java
@@ -50,9 +50,8 @@ public class LapackTestsC extends BaseNd4jTestWithBackends {
         Nd4j.setDataType(initialType);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetRF1DifferentOrders(Nd4jBackend backend) {
         INDArray a = Nd4j.linspace(1, 9, 9, Nd4j.dataType()).reshape(3, 3);
         INDArray exp = Nd4j.create(new double[] {7.0, 8.0, 9.0, 0.14285715, 0.85714287, 1.7142857, 0.5714286, 0.5, 0.0},
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/lapack/LapackTestsF.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/lapack/LapackTestsF.java
index c721dbf24..635dc3a6a 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/lapack/LapackTestsF.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/lapack/LapackTestsF.java
@@ -50,9 +50,8 @@ public class LapackTestsF extends BaseNd4jTestWithBackends {
         Nd4j.setDataType(initialType);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetRF1DifferentOrders(Nd4jBackend backend) {
         INDArray a = Nd4j.create(new double[] {1, 2, 3, 4, 5, 6, 7, 8, 9}, new int[] {3, 3}, 'c').dup('f');
         INDArray exp = Nd4j.create(new double[] {7.0, 8.0, 9.0, 0.14285715, 0.85714287, 1.7142857, 0.5714286, 0.5, 0.0},
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/learning/UpdaterTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/learning/UpdaterTest.java
index 5f71ab417..b94552bed 100755
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/learning/UpdaterTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/learning/UpdaterTest.java
@@ -43,9 +43,8 @@ public class UpdaterTest extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAdaGradLegacy(Nd4jBackend backend) {
         int rows = 1;
         int cols = 1;
@@ -58,9 +57,8 @@ public class UpdaterTest extends BaseNd4jTestWithBackends {
         assertEquals(1e-1, w.getDouble(0), 1e-1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNesterovs(Nd4jBackend backend) {
         int rows = 10;
         int cols = 2;
@@ -79,9 +77,8 @@ public class UpdaterTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAdaGrad(Nd4jBackend backend) {
         int rows = 10;
         int cols = 2;
@@ -101,9 +98,8 @@ public class UpdaterTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAdaDelta(Nd4jBackend backend) {
         int rows = 10;
         int cols = 2;
@@ -123,9 +119,8 @@ public class UpdaterTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAdam(Nd4jBackend backend) {
         int rows = 10;
         int cols = 2;
@@ -145,9 +140,8 @@ public class UpdaterTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNadam(Nd4jBackend backend) {
         int rows = 10;
         int cols = 2;
@@ -166,9 +160,8 @@ public class UpdaterTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAdaMax(Nd4jBackend backend) {
         int rows = 10;
         int cols = 2;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/learning/UpdaterValidation.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/learning/UpdaterValidation.java
index e4d6a8099..0285c8036 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/learning/UpdaterValidation.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/learning/UpdaterValidation.java
@@ -52,9 +52,8 @@ public class UpdaterValidation extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAdaDeltaUpdater(Nd4jBackend backend) {
         double rho = 0.95;
         double epsilon = 1e-6;
@@ -93,9 +92,8 @@ public class UpdaterValidation extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAdaGradUpdater(Nd4jBackend backend) {
         double lr = 0.1;
         double epsilon = 1e-6;
@@ -129,9 +127,8 @@ public class UpdaterValidation extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAdamUpdater(Nd4jBackend backend) {
 
         double lr = 1e-3;
@@ -173,9 +170,8 @@ public class UpdaterValidation extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAdaMaxUpdater(Nd4jBackend backend) {
         double lr = 1e-3;
         double beta1 = 0.9;
@@ -216,9 +212,8 @@ public class UpdaterValidation extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAmsGradUpdater(Nd4jBackend backend) {
         double lr = 1e-3;
         double beta1 = 0.9;
@@ -265,9 +260,8 @@ public class UpdaterValidation extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNadamUpdater(Nd4jBackend backend) {
 
         double lr = 1e-3;
@@ -309,9 +303,8 @@ public class UpdaterValidation extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNesterovUpdater(Nd4jBackend backend) {
 
         double lr = 0.1;
@@ -343,9 +336,8 @@ public class UpdaterValidation extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRmsPropUpdater(Nd4jBackend backend) {
 
         double lr = 0.1;
@@ -379,9 +371,8 @@ public class UpdaterValidation extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSgdUpdater(Nd4jBackend backend) {
         double lr = 0.1;
 
@@ -403,9 +394,8 @@ public class UpdaterValidation extends BaseNd4jTestWithBackends {
 
 
     /*
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void createUpdaterTestCases(Nd4jBackend backend) {
         Nd4j.create(1);
         Nd4j.getRandom().setSeed(12345);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/lossfunctions/LossFunctionJson.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/lossfunctions/LossFunctionJson.java
index 3668142f6..01a83c5e2 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/lossfunctions/LossFunctionJson.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/lossfunctions/LossFunctionJson.java
@@ -52,9 +52,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class LossFunctionJson extends BaseNd4jTestWithBackends {
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testJsonSerialization(Nd4jBackend backend) throws Exception {
 
         INDArray w = Nd4j.create(new double[] {1.0, 2.0, 3.0});
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/lossfunctions/LossFunctionTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/lossfunctions/LossFunctionTest.java
index ef585e825..7437c805f 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/lossfunctions/LossFunctionTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/lossfunctions/LossFunctionTest.java
@@ -45,16 +45,13 @@ import org.nd4j.linalg.lossfunctions.impl.LossMSLE;
 import org.nd4j.linalg.lossfunctions.impl.LossNegativeLogLikelihood;
 import org.nd4j.linalg.lossfunctions.impl.LossSparseMCXENT;
 
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class LossFunctionTest extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testClippingXENT(Nd4jBackend backend) {
 
         ILossFunction l1 = new LossBinaryXENT(0);
@@ -83,9 +80,8 @@ public class LossFunctionTest extends BaseNd4jTestWithBackends {
         assertEquals(0, match2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWeightedLossFunctionDTypes(Nd4jBackend backend){
 
         for(DataType activationsDt : new DataType[]{DataType.DOUBLE, DataType.FLOAT, DataType.HALF}){
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/lossfunctions/TestLossFunctionsSizeChecks.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/lossfunctions/TestLossFunctionsSizeChecks.java
index 445938020..19fadaeda 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/lossfunctions/TestLossFunctionsSizeChecks.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/lossfunctions/TestLossFunctionsSizeChecks.java
@@ -20,7 +20,6 @@
 
 package org.nd4j.linalg.lossfunctions;
 
-import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -31,6 +30,9 @@ import org.nd4j.linalg.factory.Nd4j;
 import org.nd4j.linalg.factory.Nd4jBackend;
 import org.nd4j.linalg.lossfunctions.LossFunctions.LossFunction;
 
+import static org.junit.jupiter.api.Assertions.*;
+
+
 public class TestLossFunctionsSizeChecks extends BaseNd4jTestWithBackends {
 
 
@@ -39,9 +41,8 @@ public class TestLossFunctionsSizeChecks extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testL2(Nd4jBackend backend) {
         LossFunction[] lossFunctionList = {LossFunction.MSE, LossFunction.L1, LossFunction.XENT,
                 LossFunction.MCXENT, LossFunction.SQUARED_LOSS, LossFunction.RECONSTRUCTION_CROSSENTROPY,
@@ -71,16 +72,16 @@ public class TestLossFunctionsSizeChecks extends BaseNd4jTestWithBackends {
             INDArray preOutput = Nd4j.create(100, 44);
             double score = loss.computeScore(labels, preOutput, Activation.IDENTITY.getActivationFunction(), null,
                     true);
-            Assert.assertFalse(
+            assertFalse(
+                    true,
                     "Loss function " + loss.toString()
-                            + "did not check for size mismatch.  This should fail to compute an activation function because the sizes of the vectors are not equal",
-                    true);
+                                        + "did not check for size mismatch.  This should fail to compute an activation function because the sizes of the vectors are not equal");
         } catch (IllegalArgumentException ex) {
             String exceptionMessage = ex.getMessage();
-            Assert.assertTrue(
+            assertTrue(
+                    exceptionMessage.contains("shapes"),
                     "Loss function exception " + loss.toString()
-                            + " did not indicate size mismatch when vectors of incorrect size were used.",
-                    exceptionMessage.contains("shapes"));
+                                        + " did not indicate size mismatch when vectors of incorrect size were used.");
         }
 
         try {
@@ -88,16 +89,16 @@ public class TestLossFunctionsSizeChecks extends BaseNd4jTestWithBackends {
             INDArray preOutput = Nd4j.create(100, 44);
             INDArray gradient =
                     loss.computeGradient(labels, preOutput, Activation.IDENTITY.getActivationFunction(), null);
-            Assert.assertFalse(
+            assertFalse(
+                    true,
                     "Loss function " + loss.toString()
-                            + "did not check for size mismatch.  This should fail to compute an activation function because the sizes of the vectors are not equal",
-                    true);
+                                        + "did not check for size mismatch.  This should fail to compute an activation function because the sizes of the vectors are not equal");
         } catch (IllegalArgumentException ex) {
             String exceptionMessage = ex.getMessage();
-            Assert.assertTrue(
+            assertTrue(
+                    exceptionMessage.contains("shapes"),
                     "Loss function exception " + loss.toString()
-                            + " did not indicate size mismatch when vectors of incorrect size were used.",
-                    exceptionMessage.contains("shapes"));
+                                        + " did not indicate size mismatch when vectors of incorrect size were used.");
         }
 
     }
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/memory/AccountingTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/memory/AccountingTests.java
index d22a83ad6..df58891e1 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/memory/AccountingTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/memory/AccountingTests.java
@@ -44,9 +44,8 @@ import static org.junit.jupiter.api.Assertions.*;
 @Disabled
 public class AccountingTests extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDetached_1(Nd4jBackend backend) {
         val array = Nd4j.createFromArray(1, 2, 3, 4, 5);
         assertEquals(DataType.INT, array.dataType());
@@ -54,9 +53,8 @@ public class AccountingTests extends BaseNd4jTestWithBackends {
         assertTrue(Nd4j.getMemoryManager().allocatedMemory(0) > 0L);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDetached_2(Nd4jBackend backend) {
         val deviceId = Nd4j.getAffinityManager().getDeviceForCurrentThread();
 
@@ -71,9 +69,8 @@ public class AccountingTests extends BaseNd4jTestWithBackends {
         assertTrue(AllocationsTracker.getInstance().bytesOnDevice(AllocationKind.CONSTANT, Nd4j.getAffinityManager().getDeviceForCurrentThread()) > 0);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWorkspaceAccounting_1(Nd4jBackend backend) {
         val deviceId = Nd4j.getAffinityManager().getDeviceForCurrentThread();
         val wsConf = WorkspaceConfiguration.builder()
@@ -97,9 +94,8 @@ public class AccountingTests extends BaseNd4jTestWithBackends {
         assertTrue(after < middle);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWorkspaceAccounting_2(Nd4jBackend backend) {
         val deviceId = Nd4j.getAffinityManager().getDeviceForCurrentThread();
         val wsConf = WorkspaceConfiguration.builder()
@@ -128,9 +124,8 @@ public class AccountingTests extends BaseNd4jTestWithBackends {
         assertTrue(after < middle1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testManualDeallocation_1(Nd4jBackend backend) {
         val deviceId = Nd4j.getAffinityManager().getDeviceForCurrentThread();
         val before = Nd4j.getMemoryManager().allocatedMemory(deviceId);
@@ -149,9 +144,8 @@ public class AccountingTests extends BaseNd4jTestWithBackends {
         assertTrue(after <= middle);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTracker_1(Nd4jBackend backend) {
         val tracker = new DeviceAllocationsTracker();
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/memory/CloseableTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/memory/CloseableTests.java
index a7ceeca5d..6ce604bb5 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/memory/CloseableTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/memory/CloseableTests.java
@@ -38,9 +38,8 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class CloseableTests extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSimpleRelease_1(Nd4jBackend backend) {
         val array = Nd4j.createFromArray(new float[]{1, 2, 3, 4, 5});
         assertTrue(array.closeable());
@@ -50,9 +49,8 @@ public class CloseableTests extends BaseNd4jTestWithBackends {
         assertFalse(array.closeable());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCyclicRelease_1(Nd4jBackend backend) {
         for (int e = 0; e < 100; e++) {
             try (val array = Nd4j.createFromArray(new float[]{1, 2, 3, 4, 5})) {
@@ -62,9 +60,8 @@ public class CloseableTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testViewRelease_1(Nd4jBackend backend) {
         val array = Nd4j.create(5, 5);
         assertTrue(array.closeable());
@@ -75,9 +72,8 @@ public class CloseableTests extends BaseNd4jTestWithBackends {
         assertFalse(view.closeable());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAttachedRelease_1(Nd4jBackend backend) {
         val wsconf = WorkspaceConfiguration.builder().build();
 
@@ -89,7 +85,7 @@ public class CloseableTests extends BaseNd4jTestWithBackends {
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAccessException_1(Nd4jBackend backend) {
        assertThrows(IllegalStateException.class,() -> {
            val array = Nd4j.create(5, 5);
@@ -102,7 +98,7 @@ public class CloseableTests extends BaseNd4jTestWithBackends {
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAccessException_2(Nd4jBackend backend) {
       assertThrows(IllegalStateException.class,() -> {
           val array = Nd4j.create(5, 5);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/memory/DeviceLocalNDArrayTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/memory/DeviceLocalNDArrayTests.java
index 0325187cc..bf7f15f7c 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/memory/DeviceLocalNDArrayTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/memory/DeviceLocalNDArrayTests.java
@@ -44,9 +44,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class DeviceLocalNDArrayTests extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDeviceLocalStringArray(Nd4jBackend backend){
         val arr = Nd4j.create(Arrays.asList("first", "second"), 2);
         assertEquals(DataType.UTF8, arr.dataType());
@@ -60,9 +59,8 @@ public class DeviceLocalNDArrayTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDtypes(Nd4jBackend backend){
         for(DataType globalDType : new DataType[]{DataType.DOUBLE, DataType.FLOAT, DataType.HALF}){
             Nd4j.setDefaultDataTypes(globalDType, globalDType);
@@ -75,9 +73,8 @@ public class DeviceLocalNDArrayTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDeviceLocalUpdate_1(Nd4jBackend backend) throws Exception {
         val numDevices = Nd4j.getAffinityManager().getNumberOfDevices();
         if (numDevices < 2)
@@ -121,9 +118,8 @@ public class DeviceLocalNDArrayTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDelayedDeviceLocalUpdate_1(Nd4jBackend backend) throws Exception {
         val numDevices = Nd4j.getAffinityManager().getNumberOfDevices();
         if (numDevices < 2)
@@ -150,9 +146,8 @@ public class DeviceLocalNDArrayTests extends BaseNd4jTestWithBackends {
         assertEquals(numDevices, counter.get());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDelayedDeviceLocalUpdate_2(Nd4jBackend backend) throws Exception {
         val numDevices = Nd4j.getAffinityManager().getNumberOfDevices();
         if (numDevices < 2)
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/mixed/MixedDataTypesTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/mixed/MixedDataTypesTests.java
index 54df2223d..d4f3058ff 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/mixed/MixedDataTypesTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/mixed/MixedDataTypesTests.java
@@ -61,9 +61,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicCreation_1(Nd4jBackend backend) {
         val array = Nd4j.create(DataType.LONG, 3, 3);
 
@@ -73,9 +72,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(DataType.LONG, ArrayOptionsHelper.dataType(array.shapeInfoJava()));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicCreation_2(Nd4jBackend backend) {
         val array = Nd4j.create(DataType.SHORT, 3, 3);
 
@@ -85,9 +83,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(DataType.SHORT, ArrayOptionsHelper.dataType(array.shapeInfoJava()));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicCreation_3(Nd4jBackend backend) {
         val array = Nd4j.create(DataType.HALF, 3, 3);
 
@@ -97,9 +94,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(DataType.HALF, ArrayOptionsHelper.dataType(array.shapeInfoJava()));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicCreation_4(Nd4jBackend backend) {
         val scalar = Nd4j.scalar(DataType.DOUBLE, 1.0);
         assertNotNull(scalar);
@@ -109,9 +105,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(1.0, scalar.getDouble(0), 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicCreation_5(Nd4jBackend backend) {
         val scalar = Nd4j.scalar(Integer.valueOf(1));
         assertNotNull(scalar);
@@ -121,9 +116,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(1.0, scalar.getInt(0), 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicCreation_5_0(Nd4jBackend backend) {
         val scalar = Nd4j.scalar(Long.valueOf(1));
         assertNotNull(scalar);
@@ -133,9 +127,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(1.0, scalar.getInt(0), 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicCreation_5_1(Nd4jBackend backend) {
         val scalar = Nd4j.scalar(Double.valueOf(1));
         assertNotNull(scalar);
@@ -145,9 +138,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(1.0, scalar.getDouble(0), 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicCreation_5_2(Nd4jBackend backend) {
         val scalar = Nd4j.scalar(Float.valueOf(1));
         assertNotNull(scalar);
@@ -157,9 +149,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(1.0, scalar.getDouble(0), 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicCreation_5_3(Nd4jBackend backend) {
         val scalar = Nd4j.scalar(Short.valueOf((short) 1));
         assertNotNull(scalar);
@@ -169,9 +160,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(1.0, scalar.getDouble(0), 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicCreation_5_4(Nd4jBackend backend) {
         val scalar = Nd4j.scalar(Byte.valueOf((byte) 1));
         assertNotNull(scalar);
@@ -181,9 +171,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(1.0, scalar.getDouble(0), 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicCreation_6(Nd4jBackend backend) {
         val scalar = Nd4j.scalar(1);
         assertNotNull(scalar);
@@ -193,9 +182,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(1.0, scalar.getInt(0), 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicCreation_7(Nd4jBackend backend) {
         val scalar = Nd4j.scalar(1L);
         assertNotNull(scalar);
@@ -205,9 +193,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(1, scalar.getInt(0));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicOps_1(Nd4jBackend backend) {
         val exp = new int[]{1,1,1,1,1,1,1,1,1};
         val array = Nd4j.create(DataType.INT, 3, 3);
@@ -218,9 +205,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(exp, vector);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicOps_2(Nd4jBackend backend) {
         val exp = new int[]{1,1,1,1,1,1,1,1,1};
         val arrayX = Nd4j.create(DataType.INT, 3, 3);
@@ -232,9 +218,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(exp, vector);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicOps_3(Nd4jBackend backend) {
         if (!NativeOpsHolder.getInstance().getDeviceNativeOps().isExperimentalEnabled())
             return;
@@ -252,9 +237,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(exp, vectorX);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicOps_4(Nd4jBackend backend) {
         val arrayX = Nd4j.create(new int[]{7,8,7,9,1,1,1,1,1}, new long[]{3, 3}, DataType.LONG);
 
@@ -264,9 +248,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(9L, l);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicOps_5(Nd4jBackend backend) {
         val arrayX = Nd4j.create(new int[]{1, 2, 3, 4}, new  long[]{4}, DataType.INT);
 
@@ -275,9 +258,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(2.5f, result, 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicOps_6(Nd4jBackend backend) {
         val arrayX = Nd4j.create(new int[]{1, 0, 0, 4}, new  long[]{4}, DataType.INT);
 
@@ -289,9 +271,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(2, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicOps_7(Nd4jBackend backend) {
         val arrayX = Nd4j.create(new float[]{1, 0, Float.NaN, 4}, new  long[]{4}, DataType.FLOAT);
 
@@ -307,9 +288,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(1, result2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicOps_8(Nd4jBackend backend) {
         val arrayX = Nd4j.create(new int[]{1, 2, 3, 4}, new  long[]{4}, DataType.INT);
         val arrayY = Nd4j.create(new int[]{1, 0, 0, 4}, new  long[]{4}, DataType.INT);
@@ -322,9 +302,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(exp, arr);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicOps_9(Nd4jBackend backend) {
         val arrayX = Nd4j.create(new int[]{1, 2, 3, 4}, new  long[]{4}, DataType.INT);
         val arrayY = Nd4j.create(new int[]{1, 2, 3, 4}, new  long[]{4}, DataType.INT);
@@ -337,9 +316,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(1.0, arr, 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNewAssign_1(Nd4jBackend backend) {
         val arrayX = Nd4j.create(DataType.FLOAT, 5);
         val arrayY = Nd4j.create(new double[]{1, 2, 3, 4, 5});
@@ -350,9 +328,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, arrayX);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNewAssign_2(Nd4jBackend backend) {
         val arrayX = Nd4j.create(DataType.INT, 5);
         val arrayY = Nd4j.create(new double[]{1, 2, 3, 4, 5});
@@ -363,9 +340,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, arrayX);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMethods_1(Nd4jBackend backend) {
         val arrayX = Nd4j.create(new int[]{1, 2, 3, 4}, new  long[]{4}, DataType.INT);
         val arrayY = Nd4j.create(new int[]{1, 2, 3, 4}, new  long[]{4}, DataType.INT);
@@ -376,9 +352,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, arrayZ);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMethods_2(Nd4jBackend backend) {
         if (!NativeOpsHolder.getInstance().getDeviceNativeOps().isExperimentalEnabled())
             return;
@@ -393,9 +368,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, arrayZ);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMethods_3(Nd4jBackend backend) {
         if (!NativeOpsHolder.getInstance().getDeviceNativeOps().isExperimentalEnabled())
             return;
@@ -458,9 +432,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFlatSerde_1(Nd4jBackend backend) {
         val arrayX = Nd4j.create(new int[]{1, 2, 3, 4}, new  long[]{4}, DataType.INT);
 
@@ -476,9 +449,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(arrayX, restored);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFlatSerde_2(Nd4jBackend backend) {
         val arrayX = Nd4j.create(new long[]{1, 2, 3, 4}, new  long[]{4}, DataType.LONG);
 
@@ -494,9 +466,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(arrayX, restored);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFlatSerde_3(Nd4jBackend backend) {
         val arrayX = Nd4j.create(new boolean[]{true, false, true, true}, new  long[]{4}, DataType.BOOL);
 
@@ -512,9 +483,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(arrayX, restored);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBoolFloatCast2(){
         val first = Nd4j.zeros(DataType.FLOAT, 3, 5000);
         INDArray asBool = first.castTo(DataType.BOOL);
@@ -534,9 +504,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, asFloat);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReduce3Large(Nd4jBackend backend) {
         val arrayX = Nd4j.create(DataType.FLOAT, 10, 5000);
         val arrayY = Nd4j.create(DataType.FLOAT, 10, 5000);
@@ -545,9 +514,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAssignScalarSimple(){
         for(DataType dt : new DataType[]{DataType.DOUBLE, DataType.FLOAT, DataType.HALF}) {
             INDArray arr = Nd4j.scalar(dt, 10.0);
@@ -556,9 +524,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSimple(){
         Nd4j.create(1);
         for(DataType dt : new DataType[]{DataType.DOUBLE, DataType.FLOAT, DataType.HALF, DataType.INT, DataType.LONG}) {
@@ -582,9 +549,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWorkspaceBool(){
         val conf = WorkspaceConfiguration.builder().minSize(10 * 1024 * 1024)
                 .overallocationLimit(1.0).policyAllocation(AllocationPolicy.OVERALLOCATE)
@@ -627,9 +593,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(source.getDouble(0), restored.getDouble(0), 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBfloat16_1(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.BFLOAT16, 5);
         val y = Nd4j.createFromArray(new int[]{2, 2, 2, 2, 2}).castTo(DataType.BFLOAT16);
@@ -638,9 +603,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(x, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUint16_1(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.UINT16, 5);
         val y = Nd4j.createFromArray(new int[]{2, 2, 2, 2, 2}).castTo(DataType.UINT16);
@@ -649,9 +613,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(x, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUint32_1(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.UINT32, 5);
         val y = Nd4j.createFromArray(new int[]{2, 2, 2, 2, 2}).castTo(DataType.UINT32);
@@ -660,9 +623,8 @@ public class MixedDataTypesTests extends BaseNd4jTestWithBackends {
         assertEquals(x, y);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUint64_1(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.UINT64, 5);
         val y = Nd4j.createFromArray(new int[]{2, 2, 2, 2, 2}).castTo(DataType.UINT64);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/mixed/StringArrayTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/mixed/StringArrayTests.java
index 79268a06a..ad630ec09 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/mixed/StringArrayTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/mixed/StringArrayTests.java
@@ -43,9 +43,8 @@ public class StringArrayTests extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicStrings_1(Nd4jBackend backend) {
         val array = Nd4j.scalar("alpha");
 
@@ -60,9 +59,8 @@ public class StringArrayTests extends BaseNd4jTestWithBackends {
         System.out.println(s);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicStrings_2(Nd4jBackend backend) {
         val array = Nd4j.create("alpha","beta", "gamma");
 
@@ -81,9 +79,8 @@ public class StringArrayTests extends BaseNd4jTestWithBackends {
         System.out.println(s);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicStrings_3() {
         val arrayX = Nd4j.create("alpha", "beta", "gamma");
         val arrayY = Nd4j.create("alpha", "beta", "gamma");
@@ -94,9 +91,8 @@ public class StringArrayTests extends BaseNd4jTestWithBackends {
         assertNotEquals(arrayX, arrayZ);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicStrings_4() {
         val arrayX = Nd4j.create("alpha", "beta", "gamma");
 
@@ -114,9 +110,8 @@ public class StringArrayTests extends BaseNd4jTestWithBackends {
         assertEquals("gamma", restored.getString(2));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicStrings_4a() {
         val arrayX = Nd4j.scalar("alpha");
 
@@ -134,9 +129,8 @@ public class StringArrayTests extends BaseNd4jTestWithBackends {
         assertEquals("alpha", restored.getString(0));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicStrings_5() {
         val arrayX = Nd4j.create("alpha", "beta", "gamma");
         val arrayZ0 = arrayX.dup();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/multithreading/MultithreadedTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/multithreading/MultithreadedTests.java
index fc0c780a4..cbc7fd48e 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/multithreading/MultithreadedTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/multithreading/MultithreadedTests.java
@@ -41,9 +41,8 @@ public class MultithreadedTests extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void basicMigrationTest_1() throws Exception {
         if (Nd4j.getAffinityManager().getNumberOfDevices() < 2)
             return;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/nativ/NativeBlasTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/nativ/NativeBlasTests.java
index 86801bb18..0717bd0d3 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/nativ/NativeBlasTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/nativ/NativeBlasTests.java
@@ -51,9 +51,8 @@ public class NativeBlasTests extends BaseNd4jTestWithBackends {
         Nd4j.getExecutioner().enableVerboseMode(false);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBlasGemm1(Nd4jBackend backend) {
 
         // we're skipping blas here
@@ -79,9 +78,8 @@ public class NativeBlasTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBlasGemm2(Nd4jBackend backend) {
 
         // we're skipping blas here
@@ -107,9 +105,8 @@ public class NativeBlasTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBlasGemm3(Nd4jBackend backend) {
 
         // we're skipping blas here
@@ -135,9 +132,8 @@ public class NativeBlasTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBlasGemm4(Nd4jBackend backend) {
 
         // we're skipping blas here
@@ -163,9 +159,8 @@ public class NativeBlasTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBlasGemm5(Nd4jBackend backend) {
 
         // we're skipping blas here
@@ -190,9 +185,8 @@ public class NativeBlasTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, res);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBlasGemm6(Nd4jBackend backend) {
 
         // we're skipping blas here
@@ -218,9 +212,8 @@ public class NativeBlasTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBlasGemm7(Nd4jBackend backend) {
 
         // we're skipping blas here
@@ -248,9 +241,8 @@ public class NativeBlasTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBlasGemv1(Nd4jBackend backend) {
 
         // we're skipping blas here
@@ -278,9 +270,8 @@ public class NativeBlasTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBlasGemv2(Nd4jBackend backend) {
 
         // we're skipping blas here
@@ -308,9 +299,8 @@ public class NativeBlasTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBlasGemv3(Nd4jBackend backend) {
 
         // we're skipping blas here
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/nativ/OpsMappingTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/nativ/OpsMappingTests.java
index df38ab49d..0a05c06e4 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/nativ/OpsMappingTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/nativ/OpsMappingTests.java
@@ -68,9 +68,8 @@ public class OpsMappingTests extends BaseNd4jTestWithBackends {
         return 360000L;     //Can be very slow on some CI machines (PPC)
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLegacyOpsMapping(Nd4jBackend backend) {
         Nd4j.create(1);
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/DerivativeTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/DerivativeTests.java
index 8420cff48..210791686 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/DerivativeTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/DerivativeTests.java
@@ -64,9 +64,8 @@ public class DerivativeTests extends BaseNd4jTestWithBackends {
         Nd4j.setDataType(this.initialType);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testHardTanhDerivative(Nd4jBackend backend) {
             //HardTanh:
         //f(x) = 1 if x > 1
@@ -92,9 +91,8 @@ public class DerivativeTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRectifiedLinearDerivative(Nd4jBackend backend) {
         //ReLU:
         //f(x) = max(0,x)
@@ -117,9 +115,8 @@ public class DerivativeTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSigmoidDerivative(Nd4jBackend backend) {
         //Derivative of sigmoid: ds(x)/dx = s(x)*(1-s(x))
         //s(x) = 1 / (exp(-x) + 1)
@@ -142,9 +139,8 @@ public class DerivativeTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testHardSigmoidDerivative(Nd4jBackend backend) {
         /*
         f(x) = min(1, max(0, 0.2*x + 0.5))
@@ -197,9 +193,8 @@ public class DerivativeTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSoftPlusDerivative(Nd4jBackend backend) {
         //s(x) = 1 / (exp(-x) + 1)
         INDArray z = Nd4j.zeros(100);
@@ -219,9 +214,8 @@ public class DerivativeTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTanhDerivative(Nd4jBackend backend) {
 
         //Derivative of sigmoid: ds(x)/dx = s(x)*(1-s(x))
@@ -244,9 +238,8 @@ public class DerivativeTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCubeDerivative(Nd4jBackend backend) {
 
         //Derivative of cube: 3*x^2
@@ -271,9 +264,8 @@ public class DerivativeTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLeakyReLUDerivative(Nd4jBackend backend) {
         //Derivative: 0.01 if x<0, 1 otherwise
         INDArray z = Nd4j.zeros(100);
@@ -293,9 +285,8 @@ public class DerivativeTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSoftSignDerivative(Nd4jBackend backend) {
         //Derivative: 1 / (1+abs(x))^2
         INDArray z = Nd4j.zeros(100).castTo(DataType.DOUBLE);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/OpConstructorTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/OpConstructorTests.java
index ad19795d6..5c2312424 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/OpConstructorTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/OpConstructorTests.java
@@ -57,9 +57,8 @@ public class OpConstructorTests extends BaseNd4jTestWithBackends {
             "org\\.nd4j\\.linalg\\.api\\.ops\\.impl\\.controlflow\\..*"
     };
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void checkForINDArrayConstructors(Nd4jBackend backend) throws Exception {
         /*
         Check that all op classes have at least one INDArray or INDArray[] constructor, so they can actually
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/OpExecutionerTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/OpExecutionerTests.java
index 2ac5dc02a..3cb758a1b 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/OpExecutionerTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/OpExecutionerTests.java
@@ -71,9 +71,8 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class OpExecutionerTests extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCosineSimilarity(Nd4jBackend backend) {
         INDArray vec1 = Nd4j.create(new float[] {1, 2, 3, 4, 5});
         INDArray vec2 = Nd4j.create(new float[] {1, 2, 3, 4, 5});
@@ -82,9 +81,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCosineDistance(){
         INDArray vec1 = Nd4j.create(new float[] {1, 2, 3});
         INDArray vec2 = Nd4j.create(new float[] {3, 5, 7});
@@ -93,9 +91,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         assertEquals(0.0025851, distance, 1e-7,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEuclideanDistance(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new double[] {55, 55});
         INDArray arr2 = Nd4j.create(new double[] {60, 60});
@@ -103,9 +100,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         assertEquals(7.0710678118654755, result, 1e-1,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDimensionalEuclidean(Nd4jBackend backend) {
         INDArray distanceInputRow = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(1, -1);
         INDArray distanceComp = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(1, -1).add(1);
@@ -135,9 +131,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarMaxOp(Nd4jBackend backend) {
         INDArray scalarMax = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).negi();
         INDArray postMax = Nd4j.ones(DataType.DOUBLE, 6);
@@ -145,9 +140,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         assertEquals(scalarMax, postMax,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSetRange(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 4, 4, DataType.DOUBLE);
         Nd4j.getExecutioner().exec(new SetRange(linspace, 0, 1));
@@ -164,18 +158,16 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNormMax(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new float[] {1, 2, 3, 4});
         double normMax = Nd4j.getExecutioner().execAndReturn(new NormMax(arr)).z().getDouble(0);
         assertEquals(4, normMax, 1e-1,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLog(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray assertion = Nd4j.create(new double[][] {{0., 1.09861229}, {0.69314718, 1.38629436}});
@@ -190,18 +182,16 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNorm2(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new float[] {1, 2, 3, 4});
         double norm2 = Nd4j.getExecutioner().execAndReturn(new Norm2(arr)).z().getDouble(0);
         assertEquals(5.4772255750516612, norm2, 1e-1,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAdd(Nd4jBackend backend) {
         OpExecutioner opExecutioner = Nd4j.getExecutioner();
         INDArray x = Nd4j.ones(5);
@@ -211,9 +201,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         assertEquals(solution, x,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMul(Nd4jBackend backend) {
         OpExecutioner opExecutioner = Nd4j.getExecutioner();
         INDArray x = Nd4j.ones(5);
@@ -224,9 +213,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testExecutioner(Nd4jBackend backend) {
         OpExecutioner opExecutioner = Nd4j.getExecutioner();
         INDArray x = Nd4j.ones(5);
@@ -243,9 +231,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMaxMin(Nd4jBackend backend) {
         OpExecutioner opExecutioner = Nd4j.getExecutioner();
         INDArray x = Nd4j.linspace(1, 5, 5, DataType.DOUBLE);
@@ -257,9 +244,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         assertEquals(1, min.getFinalResult().doubleValue(), 1e-1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testProd(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 6, 6, DataType.DOUBLE);
         Prod prod = new Prod(linspace);
@@ -267,9 +253,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         assertEquals(720, prod2, 1e-1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSum(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 6, 6, DataType.DOUBLE);
         Sum sum = new Sum(linspace);
@@ -278,9 +263,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDescriptiveStatsDouble(Nd4jBackend backend) {
         OpExecutioner opExecutioner = Nd4j.getExecutioner();
         INDArray x = Nd4j.linspace(1, 5, 5, DataType.DOUBLE);
@@ -296,17 +280,15 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIamax(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 4, 4, DataType.DOUBLE);
         assertEquals( 3, Nd4j.getBlasWrapper().iamax(linspace),getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIamax2(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 4, 4, DataType.DOUBLE);
         assertEquals( 3, Nd4j.getBlasWrapper().iamax(linspace),getFailureMessage());
@@ -317,9 +299,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDescriptiveStats(Nd4jBackend backend) {
         OpExecutioner opExecutioner = Nd4j.getExecutioner();
         INDArray x = Nd4j.linspace(1, 5, 5, DataType.DOUBLE);
@@ -333,9 +314,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         assertEquals( 2.5, variance.getFinalResult().doubleValue(), 1e-1,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRowSoftmax(Nd4jBackend backend) {
         val opExecutioner = Nd4j.getExecutioner();
         val arr = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(1, -1);
@@ -345,9 +325,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPow(Nd4jBackend backend) {
         INDArray oneThroughSix = Nd4j.linspace(1, 6, 6, DataType.DOUBLE);
         Pow pow = new Pow(oneThroughSix, 2);
@@ -357,9 +336,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testComparisonOps(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 6, 6, DataType.DOUBLE);
         INDArray ones = Nd4j.ones(DataType.BOOL, 6);
@@ -371,9 +349,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         assertEquals(ones, Nd4j.getExecutioner().exec(new ScalarLessThan(linspace, res,7)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarArithmetic(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 6, 6, DataType.DOUBLE);
         INDArray plusOne = Nd4j.linspace(2, 7, 6, DataType.DOUBLE);
@@ -382,9 +359,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDimensionMax(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(2, 3);
         int axis = 0;
@@ -399,9 +375,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStridedLog(Nd4jBackend backend) {
         OpExecutioner opExecutioner = Nd4j.getExecutioner();
         INDArray arr = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(2, 3);
@@ -412,9 +387,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         assertEquals(assertion, slice,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSoftmax(Nd4jBackend backend) {
         INDArray vec = Nd4j.linspace(1, 6, 6, DataType.DOUBLE);
         INDArray matrix = vec.dup().reshape('f', 2, 3);
@@ -425,9 +399,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         assertEquals(matrixAssertion, matrix);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOtherSoftmax(Nd4jBackend backend) {
         INDArray vec = Nd4j.linspace(1, 18, 18, DataType.DOUBLE);
         INDArray matrix = vec.dup().reshape('f', 3, 6);
@@ -440,9 +413,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testClassificationSoftmax(Nd4jBackend backend) {
         INDArray input = Nd4j.create(new double[] {-0.11537042, -0.12137824, -0.12023379, -0.121212654, -0.11363918,
                 -0.10101747, -0.11571036, -0.11699755, -0.12303393, -0.12222538, -0.111205295, -0.11710347,
@@ -573,9 +545,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAddBroadcast(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape('f', 2, 3);
         INDArray arrRow = Nd4j.create(new double[] {1, 2, 3});
@@ -590,9 +561,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStridedExp(Nd4jBackend backend) {
         OpExecutioner opExecutioner = Nd4j.getExecutioner();
         INDArray arr = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(2, 3);
@@ -605,9 +575,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         assertEquals( Nd4j.create(expected), slice,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSoftMax(Nd4jBackend backend) {
         OpExecutioner opExecutioner = Nd4j.getExecutioner();
         INDArray arr = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(1, -1);
@@ -616,9 +585,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         assertEquals(1.0, softMax.outputArguments().get(0).sumNumber().doubleValue(), 1e-1,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIMax(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 10, 10, DataType.DOUBLE);
         ArgMax imax = new ArgMax(arr);
@@ -630,9 +598,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         assertEquals(0, maxIdx);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIMin(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 10, 10, DataType.DOUBLE);
         ArgMin imin = new ArgMin(arr);
@@ -645,9 +612,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMeanSumSimple(Nd4jBackend backend) {
 //        System.out.println("3d");
         INDArray arr = Nd4j.ones(1, 4, 4);
@@ -684,9 +650,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void tescodtSum6d(Nd4jBackend backend) {
         INDArray arr6 = Nd4j.ones(1, 1, 4, 4, 4, 4);
         INDArray arr6s = arr6.sum(2, 3);
@@ -696,9 +661,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
             assertEquals(16, arr6s.getDouble(i), 1e-1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSum6d2(Nd4jBackend backend) {
         char origOrder = Nd4j.order();
         try {
@@ -735,9 +699,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMean6d(Nd4jBackend backend) {
         INDArray arr6 = Nd4j.ones(1, 1, 4, 4, 4, 4);
 
@@ -755,9 +718,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStdev(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new float[] {0.9296161f, 0.31637555f, 0.1839188f}, new int[] {1, 3}, ordering());
         double stdev = arr.stdNumber(true).doubleValue();
@@ -772,9 +734,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         assertEquals(stdev, stdev2, 1e-3);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVariance(Nd4jBackend backend) {
         val f = new double[] {0.9296161, 0.31637555, 0.1839188};
         INDArray arr = Nd4j.create(f, new int[] {1, 3}, ordering());
@@ -789,9 +750,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, var, 1e-7f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDropout(Nd4jBackend backend) {
         INDArray array = Nd4j.linspace(1, 100, 100, DataType.DOUBLE);
         INDArray result = Nd4j.create(DataType.DOUBLE, 100);
@@ -805,9 +765,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         assertNotEquals(array, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDropoutInverted(Nd4jBackend backend) {
         INDArray array = Nd4j.linspace(1, 100, 100, DataType.DOUBLE);
         INDArray result = Nd4j.create(DataType.DOUBLE, 100);
@@ -821,9 +780,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         assertNotEquals(array, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVPull1(Nd4jBackend backend) {
         int indexes[] = new int[] {0, 2, 4};
         INDArray array = Nd4j.linspace(1, 25, 25, DataType.DOUBLE).reshape(5, 5);
@@ -839,9 +797,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         assertEquals(assertion, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVPull2(Nd4jBackend backend) {
         int indexes[] = new int[] {0, 2, 4};
         INDArray array = Nd4j.linspace(1, 25, 25, DataType.DOUBLE).reshape(5, 5);
@@ -861,9 +818,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPile1(Nd4jBackend backend) {
         List<INDArray> arrays = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
@@ -878,9 +834,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPile2(Nd4jBackend backend) {
         List<INDArray> arrays = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
@@ -895,9 +850,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPile3(Nd4jBackend backend) {
         List<INDArray> arrays = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
@@ -912,9 +866,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPile4(Nd4jBackend backend) {
         val arrayW = Nd4j.create(1, 5);
         val arrayX = Nd4j.create(1, 5);
@@ -925,9 +878,8 @@ public class OpExecutionerTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{3, 1, 5}, arrayZ.shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTear1(Nd4jBackend backend) {
         List<INDArray> arrays = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/OpExecutionerTestsC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/OpExecutionerTestsC.java
index 865bd81d9..2f6e4d874 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/OpExecutionerTestsC.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/OpExecutionerTestsC.java
@@ -89,9 +89,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSoftmaxReference(Nd4jBackend backend) {
         INDArray input = Nd4j.linspace(1,4,4, DataType.FLOAT).reshape(2,2);
         INDArray dup = input.dup();
@@ -110,9 +109,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(dup,result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarReverseSub(Nd4jBackend backend) {
         INDArray input = Nd4j.valueArrayOf(4,2.0);
         INDArray result= Nd4j.zeros(4);
@@ -122,9 +120,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastMultiDim(Nd4jBackend backend) {
         INDArray data = Nd4j.linspace(1, 30, 30, DataType.DOUBLE).reshape(2, 3, 5);
 //        System.out.println(data);
@@ -137,9 +134,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCosineSimilarity(Nd4jBackend backend) {
         INDArray vec1 = Nd4j.create(new float[] {1, 2, 3, 4, 5});
         INDArray vec2 = Nd4j.create(new float[] {1, 2, 3, 4, 5});
@@ -147,9 +143,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(1, sim, 1e-1,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCosineDistance(){
         INDArray vec1 = Nd4j.create(new float[] {1, 2, 3});
         INDArray vec2 = Nd4j.create(new float[] {3, 5, 7});
@@ -158,9 +153,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals( 0.0025851, distance, 1e-7,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLog(Nd4jBackend backend) {
         INDArray log = Nd4j.linspace(1, 6, 6, DataType.DOUBLE);
         INDArray transformed = Transforms.log(log);
@@ -168,9 +162,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, transformed);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNorm1AlongDimension(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 8, 8, DataType.DOUBLE).reshape(2, 4);
         INDArray arrNorm1 = arr.norm2(1);
@@ -179,9 +172,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEuclideanDistance(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new double[] {55, 55});
         INDArray arr2 = Nd4j.create(new double[] {60, 60});
@@ -190,9 +182,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(7.0710678118654755, result, 1e-1,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarMaxOp(Nd4jBackend backend) {
         INDArray scalarMax = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).negi();
         INDArray postMax = Nd4j.ones(DataType.DOUBLE, 6);
@@ -200,9 +191,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(postMax, scalarMax,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSetRange(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 4, 4, DataType.DOUBLE);
         Nd4j.getExecutioner().exec(new SetRange(linspace, 0, 1));
@@ -220,9 +210,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNormMax(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new float[] {1, 2, 3, 4});
         double normMax = Nd4j.getExecutioner().execAndReturn(new NormMax(arr)).getFinalResult().doubleValue();
@@ -230,18 +219,16 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNorm2(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new float[] {1, 2, 3, 4});
         double norm2 = Nd4j.getExecutioner().execAndReturn(new Norm2(arr)).getFinalResult().doubleValue();
         assertEquals( 5.4772255750516612, norm2, 1e-1,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAdd(Nd4jBackend backend) {
         OpExecutioner opExecutioner = Nd4j.getExecutioner();
         INDArray x = Nd4j.ones(5);
@@ -251,9 +238,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(solution, x,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMul(Nd4jBackend backend) {
         OpExecutioner opExecutioner = Nd4j.getExecutioner();
         INDArray x = Nd4j.ones(5);
@@ -264,9 +250,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testExecutioner(Nd4jBackend backend) {
         OpExecutioner opExecutioner = Nd4j.getExecutioner();
         INDArray x = Nd4j.ones(5);
@@ -283,9 +268,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMaxMin(Nd4jBackend backend) {
         OpExecutioner opExecutioner = Nd4j.getExecutioner();
         INDArray x = Nd4j.linspace(1, 5, 5, DataType.DOUBLE);
@@ -297,9 +281,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(1, min.getFinalResult().doubleValue(), 1e-1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testProd(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 6, 6, DataType.DOUBLE);
         Prod prod = new Prod(linspace);
@@ -307,9 +290,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(720, prod2, 1e-1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSum(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 6, 6, DataType.DOUBLE);
         Sum sum = new Sum(linspace);
@@ -322,9 +304,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDescriptiveStatsDouble(Nd4jBackend backend) {
         OpExecutioner opExecutioner = Nd4j.getExecutioner();
         INDArray x = Nd4j.linspace(1, 5, 5, DataType.DOUBLE);
@@ -339,9 +320,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDescriptiveStats(Nd4jBackend backend) {
         OpExecutioner opExecutioner = Nd4j.getExecutioner();
         INDArray x = Nd4j.linspace(1, 5, 5, DataType.DOUBLE);
@@ -355,9 +335,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals( 2.5, variance.getFinalResult().doubleValue(), 1e-1,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRowSoftmax(Nd4jBackend backend) {
         OpExecutioner opExecutioner = Nd4j.getExecutioner();
         INDArray arr = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(1, -1);
@@ -366,9 +345,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals( 1.0, softMax.outputArguments().get(0).sumNumber().doubleValue(), 1e-1,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAddiRowVector(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(2, 3);
         INDArray arr2 = Nd4j.linspace(1, 3, 3, DataType.DOUBLE);
@@ -377,9 +355,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, test);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTad(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 12, 12, DataType.DOUBLE).reshape(2, 3, 2);
         for (int i = 0; i < arr.tensorsAlongDimension(0); i++) {
@@ -389,9 +366,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPow(Nd4jBackend backend) {
         INDArray oneThroughSix = Nd4j.linspace(1, 6, 6, DataType.DOUBLE);
         Pow pow = new Pow(oneThroughSix, 2);
@@ -401,9 +377,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testComparisonOps(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 6, 6, DataType.DOUBLE);
         INDArray ones = Nd4j.ones(DataType.BOOL, 1,6);
@@ -415,9 +390,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(ones, Nd4j.getExecutioner().exec(new ScalarLessThan(linspace, res,7)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarArithmetic(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 6, 6, DataType.DOUBLE);
         INDArray plusOne = Nd4j.linspace(2, 7, 6, DataType.DOUBLE);
@@ -425,9 +399,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(plusOne, linspace);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDimensionMax(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(2, 3);
         int axis = 0;
@@ -445,9 +418,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStridedLog(Nd4jBackend backend) {
         OpExecutioner opExecutioner = Nd4j.getExecutioner();
         INDArray arr = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(2, 3);
@@ -458,9 +430,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, slice,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStridedExp(Nd4jBackend backend) {
         OpExecutioner opExecutioner = Nd4j.getExecutioner();
         INDArray arr = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(2, 3);
@@ -473,9 +444,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.create(expected), slice,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSoftMax(Nd4jBackend backend) {
         OpExecutioner opExecutioner = Nd4j.getExecutioner();
         INDArray arr = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(1, -1);
@@ -490,9 +460,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDimensionSoftMax(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(2, 3);
         val max = new SoftMax(linspace);
@@ -501,9 +470,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(linspace.getRow(0).sumNumber().doubleValue(), 1.0, 1e-1,getFailureMessage());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testColumnMean(Nd4jBackend backend) {
         INDArray twoByThree = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray columnMean = twoByThree.mean(0);
@@ -512,9 +480,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testColumnVar(Nd4jBackend backend) {
         INDArray twoByThree = Nd4j.linspace(1, 600, 600, DataType.DOUBLE).reshape(150, 4);
         INDArray columnStd = twoByThree.var(0);
@@ -522,9 +489,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, columnStd);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testColumnStd(Nd4jBackend backend) {
         INDArray twoByThree = Nd4j.linspace(1, 600, 600, DataType.DOUBLE).reshape(150, 4);
         INDArray columnStd = twoByThree.std(0);
@@ -532,18 +498,16 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, columnStd);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDim1(Nd4jBackend backend) {
         INDArray sum = Nd4j.linspace(1, 2, 2, DataType.DOUBLE).reshape(2, 1);
         INDArray same = sum.dup();
         assertEquals(same.sum(1), sum.reshape(2));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIMax(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 10, 10, DataType.DOUBLE);
         ArgMax imax = new ArgMax(arr);
@@ -555,9 +519,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(0, maxIdx);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIMin(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 10, 10, DataType.DOUBLE);
         ArgMin imin = new ArgMin(arr);
@@ -571,9 +534,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMeanSumSimple(Nd4jBackend backend) {
 //        System.out.println("3d");
         INDArray arr = Nd4j.ones(1, 4, 4);
@@ -609,9 +571,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
             assertEquals(arr6s.getDouble(i), 16, 1e-1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSum6d(Nd4jBackend backend) {
         INDArray arr6 = Nd4j.ones(1, 1, 4, 4, 4, 4);
         INDArray arr6s = arr6.sum(2, 3);
@@ -620,9 +581,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMean(Nd4jBackend backend) {
         int[] shape = new int[] {1, 2, 2, 2, 2, 2};
         int len = ArrayUtil.prod(shape);
@@ -664,9 +624,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(avgExpected, sum);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSum5d() throws Exception {
 //        System.out.println("5d");
         INDArray arr5 = Nd4j.ones(1, 1, 4, 4, 4);
@@ -682,9 +641,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOneMinus(Nd4jBackend backend) {
         INDArray in = Nd4j.linspace(1, 3, 3, DataType.DOUBLE);
         INDArray out = Transforms.timesOneMinus(in, true);
@@ -696,9 +654,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSubColumnVector(Nd4jBackend backend) {
         INDArray vec = Nd4j.linspace(1, 18, 18, DataType.DOUBLE);
         INDArray matrix = vec.dup().reshape(3, 6);
@@ -709,9 +666,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, test);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLogSoftmaxVector(Nd4jBackend backend) {
         INDArray temp = Nd4j.create(new double[] {1.0, 2.0, 3.0, 4.0});
         INDArray logsoftmax = Nd4j.getExecutioner().exec(new LogSoftMax(temp.dup()))[0];
@@ -721,9 +677,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSumDifferentOrder(Nd4jBackend backend) {
         INDArray toAssign = Nd4j.linspace(0, 3, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray cOrder = Nd4j.create(new int[] {2, 2}, 'c').assign(toAssign);
@@ -737,9 +692,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(cOrder.sum(0), fOrder.sum(0));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLogSoftmax(Nd4jBackend backend) {
         INDArray test = Nd4j.create(new double[] {-0.115370326, -0.12137828, -0.120233774, -0.12121266, -0.11363905,
                 -0.101017155, -0.11571029, -0.116997495, -0.123033985, -0.1222254, -0.11120513, -0.11710341,
@@ -867,9 +821,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSoftmax(Nd4jBackend backend) {
         INDArray vec = Nd4j.linspace(1, 18, 18, DataType.DOUBLE);
         INDArray matrix = vec.dup().reshape(3, 6);
@@ -882,9 +835,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, matrix);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStdev(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new float[] {0.9296161f, 0.31637555f, 0.1839188f}, new int[] {1, 3}, ordering());
         double stdev = arr.stdNumber().doubleValue();
@@ -895,9 +847,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, stdev, 1e-7f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVariance(Nd4jBackend backend) {
 
         INDArray arr = Nd4j.create(new float[] {0.9296161f, 0.31637555f, 0.1839188f}, new int[] {1, 3}, ordering());
@@ -910,9 +861,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, var, 1e-7f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEpsOps(Nd4jBackend backend) {
         INDArray ones = Nd4j.ones(DataType.DOUBLE, 1, 6);
         double tiny = 1.000000000000001;
@@ -923,9 +873,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertTrue(consec.sub(1).eps(5).getDouble(0, 5) == 1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVarianceSingleVsMultipleDimensions(Nd4jBackend backend) {
         // this test should always run in double
         DataType type = Nd4j.dataType();
@@ -970,9 +919,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testHistogram1(Nd4jBackend backend) {
         INDArray x = Nd4j.linspace(1, 1000, 100000, DataType.DOUBLE);
         INDArray z = Nd4j.zeros(DataType.LONG,new long[]{20});
@@ -994,9 +942,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(zExp, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testHistogram2(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new float[] {0f, 0f, 0f, 5f, 5f, 5f, 10f, 10f, 10f});
 
@@ -1015,9 +962,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         assertEquals(zExp, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEuclideanManhattanDistanceAlongDimension_Rank4(Nd4jBackend backend) {
         DataType initialType = Nd4j.dataType();
         DataTypeUtil.setDTypeForContext(DataType.DOUBLE);
@@ -1081,9 +1027,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         DataTypeUtil.setDTypeForContext(initialType);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPile1(Nd4jBackend backend) {
         List<INDArray> arrays = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
@@ -1098,9 +1043,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPile2(Nd4jBackend backend) {
         List<INDArray> arrays = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
@@ -1115,9 +1059,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMean1(Nd4jBackend backend) {
         INDArray array = Nd4j.create(32, 100, 100).assign(-119f);
         for (int i = 0; i < 32; i++) {
@@ -1133,9 +1076,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMean2(Nd4jBackend backend) {
         INDArray array = Nd4j.create(32, 100, 100);
         for (int i = 0; i < 32; i++) {
@@ -1149,18 +1091,16 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNorm2_1(Nd4jBackend backend) {
         INDArray array = Nd4j.rand(1769472, 9);
 
         INDArray max = array.max(1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNorm2_2(Nd4jBackend backend) {
         INDArray array = Nd4j.rand(new int[]{127, 164}, 1, 100, Nd4j.getRandom());
 
@@ -1182,9 +1122,8 @@ public class OpExecutionerTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTear1(Nd4jBackend backend) {
         List<INDArray> arrays = new ArrayList<>();
         val num = 10;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/RationalTanhTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/RationalTanhTest.java
index 83221b2e6..94111a468 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/RationalTanhTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/RationalTanhTest.java
@@ -35,9 +35,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class RationalTanhTest extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void gradientCheck(Nd4jBackend backend) {
 
         double eps = 1e-6;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/broadcast/row/RowVectorOpsC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/broadcast/row/RowVectorOpsC.java
index 3ba7d0841..9493e3a19 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/broadcast/row/RowVectorOpsC.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/broadcast/row/RowVectorOpsC.java
@@ -20,10 +20,8 @@
 
 package org.nd4j.linalg.ops.broadcast.row;
 
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
-
 import org.nd4j.linalg.BaseNd4jTestWithBackends;
 import org.nd4j.linalg.api.buffer.DataType;
 import org.nd4j.linalg.api.ndarray.INDArray;
@@ -40,9 +38,8 @@ public class RowVectorOpsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAddi(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         arr.addiRowVector(Nd4j.create(new double[] {1, 2}));
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/copy/CopyTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/copy/CopyTest.java
index fdbcc7770..18ee217ed 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/copy/CopyTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/ops/copy/CopyTest.java
@@ -35,18 +35,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class CopyTest extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCopy(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 4, 4).reshape(2, 2);
         INDArray dup = arr.dup();
         assertEquals(arr, dup);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDup(Nd4jBackend backend) {
 
         for (int x = 0; x < 100; x++) {
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/options/ArrayOptionsTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/options/ArrayOptionsTests.java
index 3c40a338a..bf3e380fd 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/options/ArrayOptionsTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/options/ArrayOptionsTests.java
@@ -47,43 +47,38 @@ public class ArrayOptionsTests extends BaseNd4jTestWithBackends {
         shapeInfo = new long[]{2, 2, 2, 2, 1, 0, 1, 99};
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArrayType_0(Nd4jBackend backend) {
         assertEquals(ArrayType.DENSE, ArrayOptionsHelper.arrayType(shapeInfo));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArrayType_1(Nd4jBackend backend) {
         ArrayOptionsHelper.setOptionBit(shapeInfo, ArrayType.EMPTY);
 
         assertEquals(ArrayType.EMPTY, ArrayOptionsHelper.arrayType(shapeInfo));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArrayType_2(Nd4jBackend backend) {
         ArrayOptionsHelper.setOptionBit(shapeInfo, ArrayType.SPARSE);
 
         assertEquals(ArrayType.SPARSE, ArrayOptionsHelper.arrayType(shapeInfo));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArrayType_3(Nd4jBackend backend) {
         ArrayOptionsHelper.setOptionBit(shapeInfo, ArrayType.COMPRESSED);
 
         assertEquals(ArrayType.COMPRESSED, ArrayOptionsHelper.arrayType(shapeInfo));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDataTypesToFromLong(Nd4jBackend backend) {
 
         for(DataType dt : DataType.values()){
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/profiling/InfNanTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/profiling/InfNanTests.java
index 48b8944e3..b9c0f3cb8 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/profiling/InfNanTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/profiling/InfNanTests.java
@@ -52,7 +52,7 @@ public class InfNanTests extends BaseNd4jTestWithBackends {
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInf1(Nd4jBackend backend) {
         assertThrows(ND4JIllegalStateException.class,() -> {
             Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.INF_PANIC);
@@ -69,7 +69,7 @@ public class InfNanTests extends BaseNd4jTestWithBackends {
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInf2(Nd4jBackend backend) {
         assertThrows(ND4JIllegalStateException.class,() -> {
             Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.ANY_PANIC);
@@ -83,9 +83,8 @@ public class InfNanTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInf3(Nd4jBackend backend) {
         Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.ANY_PANIC);
 
@@ -94,9 +93,8 @@ public class InfNanTests extends BaseNd4jTestWithBackends {
         OpExecutionerUtil.checkForAny(x);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInf4(Nd4jBackend backend) {
         Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.DISABLED);
 
@@ -107,7 +105,7 @@ public class InfNanTests extends BaseNd4jTestWithBackends {
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNaN1(Nd4jBackend backend) {
         assertThrows(ND4JIllegalStateException.class,() -> {
             Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.NAN_PANIC);
@@ -124,7 +122,7 @@ public class InfNanTests extends BaseNd4jTestWithBackends {
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNaN2(Nd4jBackend backend) {
         assertThrows(ND4JIllegalStateException.class,() -> {
             Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.ANY_PANIC);
@@ -138,9 +136,8 @@ public class InfNanTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNaN3(Nd4jBackend backend) {
         Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.ANY_PANIC);
 
@@ -149,9 +146,8 @@ public class InfNanTests extends BaseNd4jTestWithBackends {
         OpExecutionerUtil.checkForAny(x);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNaN4(Nd4jBackend backend) {
         Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.DISABLED);
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/profiling/OperationProfilerTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/profiling/OperationProfilerTests.java
index b942b8430..f83334582 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/profiling/OperationProfilerTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/profiling/OperationProfilerTests.java
@@ -69,9 +69,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
         Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.DISABLED);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCounter1(Nd4jBackend backend) {
         INDArray array = Nd4j.createUninitialized(100);
 
@@ -82,9 +81,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStack1(Nd4jBackend backend) {
 
         Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.ALL);
@@ -101,9 +99,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBadCombos1(Nd4jBackend backend) {
         INDArray x = Nd4j.create(100);
         INDArray y = Nd4j.create(100);
@@ -114,9 +111,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
         assertTrue(ArrayUtils.contains(causes, OpProfiler.PenaltyCause.NONE));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBadCombos2(Nd4jBackend backend) {
         INDArray x = Nd4j.create(100).reshape('f', 10, 10);
         INDArray y = Nd4j.create(100).reshape('c', 10, 10);
@@ -127,9 +123,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
         assertTrue(ArrayUtils.contains(causes, OpProfiler.PenaltyCause.MIXED_ORDER));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBadCombos3(Nd4jBackend backend) {
         INDArray x = Nd4j.create(27).reshape('c', 3, 3, 3).tensorAlongDimension(0, 1, 2);
         INDArray y = Nd4j.create(100).reshape('f', 10, 10);
@@ -142,9 +137,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
         //assertTrue(ArrayUtils.contains(causes, OpProfiler.PenaltyCause.NON_EWS_ACCESS));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBadCombos4(Nd4jBackend backend) {
         INDArray x = Nd4j.create(27).reshape('c', 3, 3, 3).tensorAlongDimension(0, 1, 2);
         INDArray y = Nd4j.create(100).reshape('f', 10, 10);
@@ -158,9 +152,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
         //assertTrue(ArrayUtils.contains(causes, OpProfiler.PenaltyCause.NON_EWS_ACCESS));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBadCombos5(Nd4jBackend backend) {
         INDArray w = Nd4j.create(100).reshape('c', 10, 10);
         INDArray x = Nd4j.create(100).reshape('c', 10, 10);
@@ -187,9 +180,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
         assertTrue(ArrayUtils.contains(causes, OpProfiler.PenaltyCause.STRIDED_ACCESS));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBadTad1(Nd4jBackend backend) {
         INDArray x = Nd4j.create(2, 4, 5, 6);
 
@@ -203,9 +195,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
         assertTrue(ArrayUtils.contains(causes, OpProfiler.PenaltyCause.TAD_NON_EWS_ACCESS));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBadTad2(Nd4jBackend backend) {
         INDArray x = Nd4j.create(2, 4, 5, 6);
 
@@ -221,9 +212,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBadTad3(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new int[] {2, 4, 5, 6, 7}, 'f');
 
@@ -252,9 +242,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
         assertTrue(ArrayUtils.contains(causes, OpProfiler.PenaltyCause.NONE));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBadTad5(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new int[] {2, 4, 5, 6, 7}, 'f');
 
@@ -269,9 +258,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCxFxF1(Nd4jBackend backend) {
         INDArray a = Nd4j.create(10, 10).reshape('f', 10, 10);
         INDArray b = Nd4j.create(10, 10).reshape('c', 10, 10);
@@ -281,9 +269,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
         assertEquals("F x C x F", ret);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCxFxF2(Nd4jBackend backend) {
         INDArray a = Nd4j.create(10, 10).reshape('c', 10, 10);
         INDArray b = Nd4j.create(10, 10).reshape('c', 10, 10);
@@ -293,9 +280,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
         assertEquals("C x C x F", ret);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCxFxF3(Nd4jBackend backend) {
         INDArray a = Nd4j.create(10, 10).reshape('c', 10, 10);
         INDArray b = Nd4j.create(10, 10).reshape('c', 10, 10);
@@ -306,9 +292,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBlasFF(Nd4jBackend backend) {
         Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.ALL);
 
@@ -404,9 +389,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScopePanic3(Nd4jBackend backend) {
         Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.SCOPE_PANIC);
 
@@ -426,9 +410,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScopePanicPerf(Nd4jBackend backend) {
         try (MemoryWorkspace workspace = Nd4j.getWorkspaceManager().getAndActivateWorkspace("WS121")) {
             INDArray x = Nd4j.create(1000, 1000).assign(1.0);
@@ -466,9 +449,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testExtendedStatistics(Nd4jBackend backend) {
         Nd4j.getExecutioner().setProfilingConfig(ProfilerConfig.builder().nativeStatistics(true).build());
 
@@ -483,9 +465,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
         assertEquals(1.0f, stats.getMeanValue(), 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNanPanic(){
         try {
             DynamicCustomOp op = DynamicCustomOp.builder("add")
@@ -516,9 +497,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInfPanic(){
         try {
             DynamicCustomOp op = DynamicCustomOp.builder("add")
@@ -549,9 +529,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOpProfilerOpContextLegacy(){
 
         for(boolean nan : new boolean[]{true, false}) {
@@ -574,9 +553,8 @@ public class OperationProfilerTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOpProfilerOpContextCustomOp(){
 
         for(boolean nan : new boolean[]{true, false}) {
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/profiling/PerformanceTrackerTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/profiling/PerformanceTrackerTests.java
index db17f7c3f..614007a9e 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/profiling/PerformanceTrackerTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/profiling/PerformanceTrackerTests.java
@@ -56,9 +56,8 @@ public class PerformanceTrackerTests extends BaseNd4jTestWithBackends {
         Nd4j.getExecutioner().setProfilingMode(OpExecutioner.ProfilingMode.SCOPE_PANIC);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAveragedHolder_1(Nd4jBackend backend) {
         val holder = new AveragingTransactionsHolder();
 
@@ -68,9 +67,8 @@ public class PerformanceTrackerTests extends BaseNd4jTestWithBackends {
         assertEquals(100L, holder.getAverageValue(MemcpyDirection.HOST_TO_HOST).longValue());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAveragedHolder_2(Nd4jBackend backend) {
         val holder = new AveragingTransactionsHolder();
 
@@ -81,9 +79,8 @@ public class PerformanceTrackerTests extends BaseNd4jTestWithBackends {
         assertEquals(100L, holder.getAverageValue(MemcpyDirection.HOST_TO_HOST).longValue());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPerformanceTracker_1(Nd4jBackend backend) {
         val perf = PerformanceTracker.getInstance();
 
@@ -92,9 +89,8 @@ public class PerformanceTrackerTests extends BaseNd4jTestWithBackends {
         assertEquals(50000, res);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPerformanceTracker_2(Nd4jBackend backend) {
         val perf = PerformanceTracker.getInstance();
 
@@ -103,9 +99,8 @@ public class PerformanceTrackerTests extends BaseNd4jTestWithBackends {
         assertEquals(500000, res);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPerformanceTracker_3(Nd4jBackend backend) {
         val perf = PerformanceTracker.getInstance();
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/profiling/StackAggregatorTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/profiling/StackAggregatorTests.java
index 2cb5048fe..81ede4120 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/profiling/StackAggregatorTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/profiling/StackAggregatorTests.java
@@ -62,9 +62,8 @@ public class StackAggregatorTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicBranching1(Nd4jBackend backend) {
         StackAggregator aggregator = new StackAggregator();
 
@@ -76,9 +75,8 @@ public class StackAggregatorTests extends BaseNd4jTestWithBackends {
         assertEquals(2, aggregator.getUniqueBranchesNumber());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicBranching2(Nd4jBackend backend) {
         StackAggregator aggregator = new StackAggregator();
 
@@ -93,9 +91,8 @@ public class StackAggregatorTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTrailingFrames1(Nd4jBackend backend) {
         StackAggregator aggregator = new StackAggregator();
         aggregator.incrementCount();
@@ -109,9 +106,8 @@ public class StackAggregatorTests extends BaseNd4jTestWithBackends {
         assertTrue(descriptor.getStackTrace()[descriptor.size() - 1].getClassName().contains("StackAggregatorTests"));
     }
 
-    /*  @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    /*@ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTrailingFrames2(Nd4jBackend backend) {
         INDArray x = Nd4j.create(new int[] {10, 10}, 'f');
         INDArray y = Nd4j.create(new int[] {10, 10}, 'c');
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/rng/HalfTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/rng/HalfTests.java
index 535cc32ac..18d423d1a 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/rng/HalfTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/rng/HalfTests.java
@@ -34,7 +34,8 @@ import org.nd4j.linalg.factory.Nd4j;
 import org.nd4j.linalg.factory.Nd4jBackend;
 import org.nd4j.linalg.ops.transforms.Transforms;
 
-import static junit.framework.TestCase.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 
 @Slf4j
 
@@ -58,9 +59,8 @@ public class HalfTests extends BaseNd4jTestWithBackends {
         Nd4j.setDataType(initialType);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRandomNorman_1(Nd4jBackend backend) {
         val array = Nd4j.randn(new long[]{20, 30});
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/rng/RandomPerformanceTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/rng/RandomPerformanceTests.java
index 3208ece6e..f9eb48d20 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/rng/RandomPerformanceTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/rng/RandomPerformanceTests.java
@@ -32,9 +32,8 @@ public class RandomPerformanceTests extends BaseNd4jTestWithBackends {
 
 
 /*
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDropoutPerformance() throws Exception {
 
         for (int i = 0; i < 100; i++) {
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/rng/RandomTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/rng/RandomTests.java
index 5cef24bfb..efc56e3c9 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/rng/RandomTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/rng/RandomTests.java
@@ -88,9 +88,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         Nd4j.setDataType(initialType);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCrossBackendEquality1(Nd4jBackend backend) {
         int[] shape = {12};
         double mean = 0;
@@ -104,9 +103,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDistribution1(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
         Random random2 = Nd4j.getRandomFactory().getNewRandomInstance(119);
@@ -128,9 +126,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDistribution2(Nd4jBackend backend) {
         val random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
         val random2 = Nd4j.getRandomFactory().getNewRandomInstance(119);
@@ -156,9 +153,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertEquals(z1, z2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDistribution3(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
 
@@ -172,9 +168,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertNotEquals(z1, z2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDistribution4(Nd4jBackend backend) {
         for (int i = 0; i < 100; i++) {
             Nd4j.getRandom().setSeed(119);
@@ -189,9 +184,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDistribution5(Nd4jBackend backend) {
         for (int i = 0; i < 100; i++) {
             Nd4j.getRandom().setSeed(120);
@@ -206,9 +200,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDistribution6(Nd4jBackend backend) {
         for (int i = 0; i < 100; i++) {
             Nd4j.getRandom().setSeed(120);
@@ -223,9 +216,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLinspace1(Nd4jBackend backend) {
         INDArray z1 = Nd4j.linspace(1, 100, 200, DataType.DOUBLE);
 
@@ -237,9 +229,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertEquals(z1, z2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDropoutInverted1(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
         Random random2 = Nd4j.getRandomFactory().getNewRandomInstance(119);
@@ -264,9 +255,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDropout1(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
         Random random2 = Nd4j.getRandomFactory().getNewRandomInstance(119);
@@ -286,9 +276,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertEquals(z1, z2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAlphaDropout1(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
         Random random2 = Nd4j.getRandomFactory().getNewRandomInstance(119);
@@ -309,9 +298,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGaussianDistribution1(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
         Random random2 = Nd4j.getRandomFactory().getNewRandomInstance(119);
@@ -339,9 +327,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertEquals(z1, z2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGaussianDistribution2(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
         Random random2 = Nd4j.getRandomFactory().getNewRandomInstance(119);
@@ -380,9 +367,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertNotEquals(z3, z4);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGaussianDistribution3(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
         Random random2 = Nd4j.getRandomFactory().getNewRandomInstance(119);
@@ -413,9 +399,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
      *
      * @throws Exception
      */
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAndersonDarling(Nd4jBackend backend) {
 
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
@@ -452,9 +437,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertTrue(A < 1.8692,"Critical (max) value for 1000 points and confidence α = 0.0001 is 1.8692, received: "+ A);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStepOver1(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
 
@@ -478,18 +462,16 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertEquals(1.0, z1.stdNumber().doubleValue(), 0.01);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSum_119(Nd4jBackend backend) {
         INDArray z2 = Nd4j.zeros(DataType.DOUBLE, 55000000);
         val sum = z2.sumNumber().doubleValue();
         assertEquals(0.0, sum, 1e-5);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLegacyDistribution1(Nd4jBackend backend) {
         NormalDistribution distribution = new NormalDistribution(new DefaultRandom(), 0.0, 1.0);
         INDArray z1 = distribution.sample(new int[] {1, 1000000});
@@ -498,9 +480,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertEquals(1.0, z1.stdNumber().doubleValue(), 0.01);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSetSeed1(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
         Random random2 = Nd4j.getRandomFactory().getNewRandomInstance(119);
@@ -539,9 +520,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertEquals(z02, z12);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testJavaSide1(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
         Random random2 = Nd4j.getRandomFactory().getNewRandomInstance(119);
@@ -559,9 +539,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(array1, array2, 1e-5f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testJavaSide2(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
         Random random2 = Nd4j.getRandomFactory().getNewRandomInstance(119);
@@ -580,9 +559,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(array1, array2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testJavaSide3(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
         Random random2 = Nd4j.getRandomFactory().getNewRandomInstance(119);
@@ -607,9 +585,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
      * @throws Exception
      */
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testJavaSide4(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
         Random random2 = Nd4j.getRandomFactory().getNewRandomInstance(119);
@@ -642,9 +619,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testJavaSide5(Nd4jBackend backend) {
         Nd4j.getRandom().setSeed(7);
         int length = 100;
@@ -668,9 +644,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertNotEquals(0, sum);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBernoulliDistribution1(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
         Random random2 = Nd4j.getRandomFactory().getNewRandomInstance(119);
@@ -690,9 +665,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertEquals(z1, z2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBernoulliDistribution2(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
         Random random2 = Nd4j.getRandomFactory().getNewRandomInstance(119);
@@ -716,9 +690,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, z1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBernoulliDistribution3(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
         Random random2 = Nd4j.getRandomFactory().getNewRandomInstance(119);
@@ -743,9 +716,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, z1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBinomialDistribution1(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
         Random random2 = Nd4j.getRandomFactory().getNewRandomInstance(119);
@@ -768,9 +740,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         BooleanIndexing.and(z1, Conditions.greaterThanOrEqual(0.0));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBinomialDistribution2(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
         Random random2 = Nd4j.getRandomFactory().getNewRandomInstance(119);
@@ -795,9 +766,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         BooleanIndexing.and(z1, Conditions.greaterThanOrEqual(0.0));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultithreading1(Nd4jBackend backend) throws Exception {
 
         final AtomicInteger cnt = new AtomicInteger(0);
@@ -835,9 +805,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultithreading2() throws Exception {
 
         final AtomicInteger cnt = new AtomicInteger(0);
@@ -874,9 +843,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStepOver3(Nd4jBackend backend) {
         Random random = Nd4j.getRandomFactory().getNewRandomInstance(119);
         if (random instanceof NativeRandom) {
@@ -903,9 +871,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStepOver4(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119, 100000);
         Random random2 = Nd4j.getRandomFactory().getNewRandomInstance(119, 100000);
@@ -918,9 +885,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSignatures1(Nd4jBackend backend) {
 
         for (int x = 0; x < 100; x++) {
@@ -931,9 +897,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testChoice1(Nd4jBackend backend) {
         INDArray source = Nd4j.create(new double[] {1, 2, 3, 4, 5});
         INDArray probs = Nd4j.create(new double[] {0.0, 0.0, 1.0, 0.0, 0.0});
@@ -943,9 +908,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, sampled);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testChoice2(Nd4jBackend backend) {
         INDArray source = Nd4j.create(new double[] {1, 2, 3, 4, 5});
         INDArray probs = Nd4j.create(new double[] {0.0, 0.0, 0.0, 0.0, 0.0});
@@ -956,9 +920,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
     }
 
     @Disabled
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDeallocation1() throws Exception {
 
         while (true) {
@@ -970,9 +933,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void someTest(Nd4jBackend backend) {
         DataTypeUtil.setDTypeForContext(DataType.DOUBLE);
         INDArray x = Nd4j.create(new double[] {-0.5753774207320429, 1.0614372269091394, 0.4522970978070401,
@@ -1348,9 +1310,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertEquals(0.0, z01.meanNumber().doubleValue(), 1e-3);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLogNormal1(Nd4jBackend backend) {
         Random random1 = Nd4j.getRandomFactory().getNewRandomInstance(119);
 
@@ -1376,9 +1337,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertEquals(mean, z01.meanNumber().doubleValue(), 1e-1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLinspace2(Nd4jBackend backend) {
         INDArray res = Nd4j.linspace(1, 5, 5, DataType.DOUBLE);
         INDArray exp = Nd4j.create(new double[] {1, 2, 3, 4, 5});
@@ -1387,33 +1347,29 @@ public class RandomTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOrthogonalDistribution1(Nd4jBackend backend) {
         val dist = new OrthogonalDistribution(1.0);
         val array = dist.sample(new int[] {6, 9});
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOrthogonalDistribution2(Nd4jBackend backend) {
         val dist = new OrthogonalDistribution(1.0);
         val array = dist.sample(new int[] {9, 6});
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOrthogonalDistribution3(Nd4jBackend backend) {
         val dist = new OrthogonalDistribution(1.0);
         val array = dist.sample(new int[] {9, 9});
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void reproducabilityTest(){
         int numBatches = 1;
 
@@ -1429,9 +1385,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testJavaInt_1(Nd4jBackend backend) {
         for (int e = 0; e < 100000; e++) {
             val i = Nd4j.getRandom().nextInt(10, 20);
@@ -1440,9 +1395,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBernoulli(){
         Nd4j.getRandom().setSeed(12345);
         INDArray arr = Nd4j.create(DataType.DOUBLE, 100);
@@ -1463,9 +1417,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         return out;
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRngRepeatabilityUniform(){
         val nexp = Nd4j.create(DataType.FLOAT, 10);
         Nd4j.getRandom().setSeed(12345);
@@ -1480,9 +1433,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertNotEquals(nexp, out1);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRngRepeatabilityBernoulli(){
         Nd4j.getRandom().setSeed(12345);
         INDArray out1 = Nd4j.create(DataType.FLOAT, 10);
@@ -1495,9 +1447,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertEquals(out1, out2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGamma(){
         Nd4j.getRandom().setSeed(12345);
         INDArray shape = Nd4j.createFromArray(new int[] {1000,1000});
@@ -1518,9 +1469,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(mean0.toFloatVector(), mean1.toFloatVector(), 1e-2f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPoisson(){
         Nd4j.getRandom().setSeed(12345);
         INDArray shape = Nd4j.createFromArray(new int[] {1,3});
@@ -1533,9 +1483,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertEquals(res[0], res1[0]);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testShuffle(){
         Nd4j.getRandom().setSeed(12345);
         INDArray alpha = Nd4j.rand(1,3);
@@ -1547,9 +1496,8 @@ public class RandomTests extends BaseNd4jTestWithBackends {
         assertEquals(res[0], res1[0]);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRandom(Nd4jBackend backend) {
         val r1 = new java.util.Random(119);
         val r2 = Nd4j.getRandom();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/rng/RngValidationTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/rng/RngValidationTests.java
index 715548c36..5861372b6 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/rng/RngValidationTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/rng/RngValidationTests.java
@@ -121,9 +121,8 @@ public class RngValidationTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void validateRngDistributions(Nd4jBackend backend){
         List<TestCase> testCases = new ArrayList<>();
         for(DataType type : new DataType[]{DataType.DOUBLE, DataType.FLOAT, DataType.HALF}) {
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/schedule/TestSchedules.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/schedule/TestSchedules.java
index 38d086d4f..29eb4e066 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/schedule/TestSchedules.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/schedule/TestSchedules.java
@@ -40,9 +40,8 @@ public class TestSchedules extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testJson() throws Exception {
 
         ObjectMapper om = new ObjectMapper();
@@ -69,9 +68,8 @@ public class TestSchedules extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScheduleValues(Nd4jBackend backend) {
 
         double lr = 0.8;
@@ -122,9 +120,8 @@ public class TestSchedules extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMapSchedule(Nd4jBackend backend) {
 
         ISchedule schedule = new MapSchedule.Builder(ScheduleType.ITERATION)
@@ -140,9 +137,8 @@ public class TestSchedules extends BaseNd4jTestWithBackends {
             }
         }
     }
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCycleSchedule(Nd4jBackend backend) {
         ISchedule schedule = new CycleSchedule(ScheduleType.ITERATION, 1.5, 100);
         assertEquals(0.15, schedule.valueAt(0, 0), 1e-6);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/serde/BasicSerDeTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/serde/BasicSerDeTests.java
index fa4abbd1b..3bc764e13 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/serde/BasicSerDeTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/serde/BasicSerDeTests.java
@@ -36,7 +36,7 @@ import org.nd4j.linalg.factory.Nd4jBackend;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 @Slf4j
@@ -50,9 +50,8 @@ public class BasicSerDeTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicDataTypeSwitch1(Nd4jBackend backend) throws Exception {
         DataType initialType = Nd4j.dataType();
         Nd4j.setDataType(DataType.FLOAT);
@@ -80,9 +79,8 @@ public class BasicSerDeTests extends BaseNd4jTestWithBackends {
         Nd4j.setDataType(initialType);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testHalfSerde_1(Nd4jBackend backend) throws Exception {
         val array = Nd4j.create(DataType.HALF, 3, 4);
         array.assign(1.0f);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/serde/JsonSerdeTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/serde/JsonSerdeTests.java
index dfaf5bfe7..a53673d68 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/serde/JsonSerdeTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/serde/JsonSerdeTests.java
@@ -52,9 +52,8 @@ public class JsonSerdeTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNDArrayTextSerializer(Nd4jBackend backend) throws Exception {
         for(char order : new char[]{'c', 'f'}) {
             Nd4j.factory().setOrder(order);
@@ -91,9 +90,8 @@ public class JsonSerdeTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBackwardCompatability(Nd4jBackend backend) throws Exception {
         Nd4j.getNDArrayFactory().setOrder('f');
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/serde/LargeSerDeTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/serde/LargeSerDeTests.java
index 63fe8057a..7cedba774 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/serde/LargeSerDeTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/serde/LargeSerDeTests.java
@@ -42,9 +42,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 @Disabled("AB 2019/05/23 - JVM crash on linux-x86_64-cpu-avx512 - issue #7657")
 public class LargeSerDeTests extends BaseNd4jTestWithBackends {
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLargeArraySerDe_1(Nd4jBackend backend) throws Exception {
         val arrayA = Nd4j.rand(new long[] {1, 135079944});
         //val arrayA = Nd4j.rand(new long[] {1, 13507});
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/serde/NumpyFormatTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/serde/NumpyFormatTests.java
index 9f8d5d7af..b1c62bba4 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/serde/NumpyFormatTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/serde/NumpyFormatTests.java
@@ -46,9 +46,8 @@ import static org.junit.jupiter.api.Assertions.*;
 @Slf4j
 public class NumpyFormatTests extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToNpyFormat(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
 
         val dir = testDir.toFile();
@@ -97,9 +96,8 @@ public class NumpyFormatTests extends BaseNd4jTestWithBackends {
         assertTrue(cnt > 0);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToNpyFormatScalars(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
 //        File dir = new File("C:\\DL4J\\Git\\dl4j-test-resources\\src\\main\\resources\\numpy_arrays\\scalar");
 
@@ -153,9 +151,8 @@ public class NumpyFormatTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNpzReading(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
 
         val dir = testDir.toFile();
@@ -195,9 +192,8 @@ public class NumpyFormatTests extends BaseNd4jTestWithBackends {
         assertTrue(cnt > 0);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTxtReading(Nd4jBackend backend) throws Exception {
         File f = new ClassPathResource("numpy_arrays/txt/arange_3,4_float32.txt").getFile();
         INDArray arr = Nd4j.readNumpy(DataType.FLOAT, f.getPath());
@@ -216,9 +212,8 @@ public class NumpyFormatTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNpy(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         for(boolean empty : new boolean[]{false, true}) {
             val dir = testDir.toFile();
@@ -262,9 +257,8 @@ public class NumpyFormatTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFromNumpyScalar(Nd4jBackend backend) throws Exception {
         val out = Nd4j.createFromNpyFile(new ClassPathResource("numpy_oneoff/scalar.npy").getFile());
         assertEquals(Nd4j.scalar(DataType.INT, 1), out);
@@ -338,9 +332,8 @@ public class NumpyFormatTests extends BaseNd4jTestWithBackends {
     }
 
     @Disabled
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNumpyBoolean(Nd4jBackend backend) {
         INDArray out = Nd4j.createFromNpyFile(new File("c:/Users/raver/Downloads/error2.npy"));
 //        System.out.println(ArrayUtil.toList(ArrayUtil.toInts(out.shape())));
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/EmptyTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/EmptyTests.java
index d51dbc2a7..3244b5d2e 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/EmptyTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/EmptyTests.java
@@ -44,9 +44,8 @@ public class EmptyTests extends BaseNd4jTestWithBackends {
     DataType initialType = Nd4j.dataType();
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmpyArray_1(Nd4jBackend backend) {
         val array = Nd4j.empty();
 
@@ -66,9 +65,8 @@ public class EmptyTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyDtype_1(Nd4jBackend backend) {
         val array = Nd4j.empty(DataType.INT);
 
@@ -76,9 +74,8 @@ public class EmptyTests extends BaseNd4jTestWithBackends {
         assertEquals(DataType.INT, array.dataType());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyDtype_2(Nd4jBackend backend) {
         val array = Nd4j.empty(DataType.LONG);
 
@@ -86,9 +83,8 @@ public class EmptyTests extends BaseNd4jTestWithBackends {
         assertEquals(DataType.LONG, array.dataType());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcat_1(Nd4jBackend backend) {
         val row1 = Nd4j.create(new double[]{1, 1, 1, 1}, new long[]{1, 4});
         val row2 = Nd4j.create(new double[]{2, 2, 2, 2}, new long[]{1, 4});
@@ -108,9 +104,8 @@ public class EmptyTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, z);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyReductions(Nd4jBackend backend){
 
         INDArray empty = Nd4j.empty(DataType.FLOAT);
@@ -139,9 +134,8 @@ public class EmptyTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetEmpty(Nd4jBackend backend){
         INDArray empty = Nd4j.empty(DataType.FLOAT);
         try {
@@ -163,9 +157,8 @@ public class EmptyTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyWithShape_1(Nd4jBackend backend) {
         val array = Nd4j.create(DataType.FLOAT, 2, 0, 3);
 
@@ -177,9 +170,8 @@ public class EmptyTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{0, 0, 0}, array.stride());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyWithShape_2(Nd4jBackend backend){
         val array = Nd4j.create(DataType.FLOAT, 0);
 
@@ -194,7 +186,7 @@ public class EmptyTests extends BaseNd4jTestWithBackends {
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
 
     public void testEmptyWithShape_3(Nd4jBackend backend) {
         assertThrows(IllegalArgumentException.class,() -> {
@@ -204,9 +196,8 @@ public class EmptyTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
 
     public void testEmptyWithShape_4(Nd4jBackend backend){
         val array = Nd4j.create(DataType.FLOAT, 0, 3);
@@ -226,9 +217,8 @@ public class EmptyTests extends BaseNd4jTestWithBackends {
         assertEquals(0, array.stride(1));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyReduction_1(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.FLOAT, 2, 0, 3);
         val e = Nd4j.create(DataType.FLOAT, 2, 1, 3).assign(0);
@@ -239,9 +229,8 @@ public class EmptyTests extends BaseNd4jTestWithBackends {
         assertEquals(e, reduced);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyReduction_2(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.FLOAT, 2, 0, 3);
         val e = Nd4j.create(DataType.FLOAT, 2, 3).assign(0);
@@ -253,9 +242,8 @@ public class EmptyTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
 
     public void testEmptyReduction_3(Nd4jBackend backend) {
         val x = Nd4j.create(DataType.FLOAT, 2, 0);
@@ -269,7 +257,7 @@ public class EmptyTests extends BaseNd4jTestWithBackends {
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyReduction_4(Nd4jBackend backend) {
         assertThrows(ND4JIllegalStateException.class,() -> {
             val x = Nd4j.create(DataType.FLOAT, 2, 0);
@@ -283,9 +271,8 @@ public class EmptyTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyCreateMethods(Nd4jBackend backend){
         DataType dt = DataType.FLOAT;
         assertArrayEquals(new long[]{0}, Nd4j.create(0).shape());
@@ -325,18 +312,16 @@ public class EmptyTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{0,0}, Nd4j.ones(0,0).ulike().shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
 
     public void testEqualShapesEmpty(Nd4jBackend backend){
         assertTrue(Nd4j.create(0).equalShapes(Nd4j.create(0)));
         assertFalse(Nd4j.create(0).equalShapes(Nd4j.create(1, 0)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEmptyWhere(Nd4jBackend backend) {
         val mask = Nd4j.createFromArray(false,     false,     false,     false,     false);
         val result = Nd4j.where(mask, null, null);
@@ -345,9 +330,8 @@ public class EmptyTests extends BaseNd4jTestWithBackends {
         assertNotNull(result[0].shapeInfoDataBuffer().asLong());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllEmptyReduce(Nd4jBackend backend){
         INDArray x = Nd4j.createFromArray(true, true, true);
         val all = new All(x);
@@ -356,9 +340,8 @@ public class EmptyTests extends BaseNd4jTestWithBackends {
         assertEquals(x, out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
 
     public void testEmptyNoop(Nd4jBackend backend) {
         val output = Nd4j.empty(DataType.LONG);
@@ -370,9 +353,8 @@ public class EmptyTests extends BaseNd4jTestWithBackends {
         Nd4j.exec(op);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
 
     public void testEmptyConstructor_1(Nd4jBackend backend) {
         val x = Nd4j.create(new double[0]);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/LongShapeTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/LongShapeTests.java
index d5c650044..f8a94abcc 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/LongShapeTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/LongShapeTests.java
@@ -38,9 +38,8 @@ public class LongShapeTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLongBuffer_1(Nd4jBackend backend) {
         val exp = new long[]{2, 5, 3, 3, 1, 0, 1, 99};
         val buffer = Nd4j.getDataBufferFactory().createLong(exp);
@@ -51,9 +50,8 @@ public class LongShapeTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLongShape_1(Nd4jBackend backend) {
         val exp = new long[]{2, 5, 3, 3, 1, 16384, 1, 99};
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/NDArrayMathTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/NDArrayMathTests.java
index 37f37f15b..cd310db03 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/NDArrayMathTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/NDArrayMathTests.java
@@ -43,9 +43,8 @@ public class NDArrayMathTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVectorPerSlice(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(2, 2, 2, 2);
         assertEquals(4, NDArrayMath.vectorsPerSlice(arr));
@@ -58,26 +57,23 @@ public class NDArrayMathTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatricesPerSlice(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(2, 2, 2, 2);
         assertEquals(2, NDArrayMath.matricesPerSlice(arr));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLengthPerSlice(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(2, 2, 2, 2);
         val lengthPerSlice = NDArrayMath.lengthPerSlice(arr);
         assertEquals(8, lengthPerSlice);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void toffsetForSlice(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(3, 2, 2);
         int slice = 1;
@@ -85,17 +81,15 @@ public class NDArrayMathTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMapOntoVector(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(3, 2, 2);
         assertEquals(NDArrayMath.mapIndexOntoVector(2, arr), 4);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNumVectors(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(3, 2, 2);
         assertEquals(4, NDArrayMath.vectorsPerSlice(arr));
@@ -104,9 +98,8 @@ public class NDArrayMathTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOffsetForSlice(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 16, 16, DataType.DOUBLE).reshape(2, 2, 2, 2);
         int[] dimensions = {0, 1};
@@ -142,18 +135,16 @@ public class NDArrayMathTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOddDimensions(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(3, 2, 2);
         val numMatrices = NDArrayMath.matricesPerSlice(arr);
         assertEquals(1, numMatrices);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTotalVectors(Nd4jBackend backend) {
         INDArray arr2 = Nd4j.create(2, 2, 2, 2);
         assertEquals(8, NDArrayMath.numVectors(arr2));
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ShapeBufferTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ShapeBufferTests.java
index 539412bc0..72a1c3319 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ShapeBufferTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ShapeBufferTests.java
@@ -42,9 +42,8 @@ public class ShapeBufferTests extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRank(Nd4jBackend backend) {
         long[] shape = {2, 4};
         long[] stride = {1, 2};
@@ -54,9 +53,8 @@ public class ShapeBufferTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArrCreationShape(Nd4jBackend backend) {
         val arr = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         for (int i = 0; i < 2; i++)
@@ -67,9 +65,8 @@ public class ShapeBufferTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testShape(Nd4jBackend backend) {
         long[] shape = {2, 4};
         long[] stride = {1, 2};
@@ -86,9 +83,8 @@ public class ShapeBufferTests extends BaseNd4jTestWithBackends {
         assertTrue(Shape.contentEquals(stride, Shape.stride(buff)));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBuff(Nd4jBackend backend) {
         long[] shape = {1, 2};
         long[] stride = {1, 2};
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ShapeTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ShapeTests.java
index d8f9daeef..a8fa4ca53 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ShapeTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ShapeTests.java
@@ -45,9 +45,8 @@ import static org.nd4j.linalg.indexing.NDArrayIndex.all;
  */
 
 public class ShapeTests extends BaseNd4jTestWithBackends {
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRowColVectorVsScalar(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(2);
         assertTrue(arr.isRowVector());
@@ -61,9 +60,8 @@ public class ShapeTests extends BaseNd4jTestWithBackends {
         assertFalse(arr3.isRowVector());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSixteenZeroOne(Nd4jBackend backend) {
         INDArray baseArr = Nd4j.linspace(1, 16, 16, DataType.DOUBLE).reshape(2, 2, 2, 2);
         assertEquals(4, baseArr.tensorsAlongDimension(0, 1));
@@ -81,9 +79,8 @@ public class ShapeTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVectorAlongDimension1(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(1, 5, 5);
         assertEquals(arr.vectorsAlongDimension(0), 5);
@@ -95,9 +92,8 @@ public class ShapeTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSixteenSecondDim(Nd4jBackend backend) {
         INDArray baseArr = Nd4j.linspace(1, 16, 16, DataType.DOUBLE).reshape(2, 2, 2, 2);
         INDArray[] assertions = new INDArray[] {Nd4j.create(new double[] {1, 5}), Nd4j.create(new double[] {9, 13}),
@@ -116,9 +112,8 @@ public class ShapeTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVectorAlongDimension(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 24, 24, DataType.FLOAT).reshape(4, 3, 2);
         INDArray assertion = Nd4j.create(new float[] {5, 17}, new long[] {2});
@@ -149,9 +144,8 @@ public class ShapeTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testThreeTwoTwo(Nd4jBackend backend) {
         INDArray threeTwoTwo = Nd4j.linspace(1, 12, 12, DataType.DOUBLE).reshape(3, 2, 2);
         INDArray[] assertions = new INDArray[] {Nd4j.create(new double[] {1, 4}), Nd4j.create(new double[] {7, 10}),
@@ -168,18 +162,16 @@ public class ShapeTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNoCopy(Nd4jBackend backend) {
         INDArray threeTwoTwo = Nd4j.linspace(1, 12, 12, DataType.DOUBLE);
         INDArray arr = Shape.newShapeNoCopy(threeTwoTwo, new long[] {3, 2, 2}, true);
         assertArrayEquals(arr.shape(), new long[] {3, 2, 2});
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testThreeTwoTwoTwo(Nd4jBackend backend) {
         INDArray threeTwoTwo = Nd4j.linspace(1, 12, 12, DataType.DOUBLE).reshape(3, 2, 2);
         INDArray[] assertions = new INDArray[] {Nd4j.create(new double[] {1, 7}), Nd4j.create(new double[] {4, 10}),
@@ -196,9 +188,8 @@ public class ShapeTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNewAxis(Nd4jBackend backend) {
         INDArray tensor = Nd4j.linspace(1, 12, 12, DataType.DOUBLE).reshape(3, 2, 2);
         INDArray assertion = Nd4j.create(new double[][] {{1, 7}, {4, 10}}).reshape(1, 2, 2);
@@ -208,9 +199,8 @@ public class ShapeTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSixteenFirstDim(Nd4jBackend backend) {
         INDArray baseArr = Nd4j.linspace(1, 16, 16, DataType.DOUBLE).reshape(2, 2, 2, 2);
         INDArray[] assertions = new INDArray[] {Nd4j.create(new double[] {1, 3}), Nd4j.create(new double[] {9, 11}),
@@ -229,9 +219,8 @@ public class ShapeTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDimShuffle(Nd4jBackend backend) {
         INDArray scalarTest = Nd4j.scalar(0.0).reshape(1, -1);
         INDArray broadcast = scalarTest.dimShuffle(new Object[] {'x'}, new long[] {0, 1}, new boolean[] {true, true});
@@ -251,9 +240,8 @@ public class ShapeTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEight(Nd4jBackend backend) {
         INDArray baseArr = Nd4j.linspace(1, 8, 8, DataType.DOUBLE).reshape(2, 2, 2);
         assertEquals(2, baseArr.tensorsAlongDimension(0, 1));
@@ -263,9 +251,8 @@ public class ShapeTests extends BaseNd4jTestWithBackends {
         assertEquals(columnVectorSecond, baseArr.tensorAlongDimension(1, 0, 1));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBroadcastShapes(){
         //Test cases: in1Shape, in2Shape, shapeOf(op(in1,in2))
         List<Triple<long[], long[], long[]>> testCases = new ArrayList<>();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ShapeTestsC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ShapeTestsC.java
index 9af908a1e..b159acdb4 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ShapeTestsC.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ShapeTestsC.java
@@ -52,9 +52,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSixteenZeroOne(Nd4jBackend backend) {
         INDArray baseArr = Nd4j.linspace(1, 16, 16, DataType.DOUBLE).reshape(2, 2, 2, 2);
         assertEquals(4, baseArr.tensorsAlongDimension(0, 1));
@@ -71,9 +70,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSixteenSecondDim(Nd4jBackend backend) {
         INDArray baseArr = Nd4j.linspace(1, 16, 16, DataType.DOUBLE).reshape(2, 2, 2, 2);
         INDArray[] assertions = new INDArray[] {Nd4j.create(new double[] {1, 3}), Nd4j.create(new double[] {2, 4}),
@@ -91,9 +89,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testThreeTwoTwo(Nd4jBackend backend) {
         INDArray threeTwoTwo = Nd4j.linspace(1, 12, 12, DataType.DOUBLE).reshape(3, 2, 2);
         INDArray[] assertions = new INDArray[] {Nd4j.create(new double[] {1, 3}), Nd4j.create(new double[] {2, 4}),
@@ -110,9 +107,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testThreeTwoTwoTwo(Nd4jBackend backend) {
         INDArray threeTwoTwo = Nd4j.linspace(1, 12, 12, DataType.DOUBLE).reshape(3, 2, 2);
         INDArray[] assertions = new INDArray[] {Nd4j.create(new double[] {1, 2}), Nd4j.create(new double[] {3, 4}),
@@ -128,9 +124,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPutRow(Nd4jBackend backend) {
         INDArray matrix = Nd4j.create(new double[][] {{1, 2}, {3, 4}});
         for (int i = 0; i < matrix.rows(); i++) {
@@ -143,9 +138,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSixteenFirstDim(Nd4jBackend backend) {
         INDArray baseArr = Nd4j.linspace(1, 16, 16, DataType.DOUBLE).reshape(2, 2, 2, 2);
         INDArray[] assertions = new INDArray[] {Nd4j.create(new double[] {1, 5}), Nd4j.create(new double[] {2, 6}),
@@ -163,9 +157,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReshapePermute(Nd4jBackend backend) {
         INDArray arrNoPermute = Nd4j.ones(DataType.DOUBLE,5, 3, 4);
         INDArray reshaped2dNoPermute = arrNoPermute.reshape(5 * 3, 4); //OK
@@ -179,9 +172,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEight(Nd4jBackend backend) {
         INDArray baseArr = Nd4j.linspace(1, 8, 8, DataType.DOUBLE).reshape(2, 2, 2);
         assertEquals(2, baseArr.tensorsAlongDimension(0, 1));
@@ -195,9 +187,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOtherReshape(Nd4jBackend backend) {
         INDArray nd = Nd4j.create(new double[] {1, 2, 3, 4, 5, 6}, new long[] {2, 3});
 
@@ -210,9 +201,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
         assertEquals(Nd4j.create(new double[] {4, 5, 6}), vector);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVectorAlongDimension(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 24, 24, DataType.DOUBLE).reshape(4, 3, 2);
         INDArray assertion = Nd4j.create(new double[] {3, 4});
@@ -281,9 +271,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testColumnSum(Nd4jBackend backend) {
         INDArray twoByThree = Nd4j.linspace(1, 600, 600, DataType.FLOAT).reshape(150, 4);
         INDArray columnVar = twoByThree.sum(0);
@@ -292,9 +281,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRowMean(Nd4jBackend backend) {
         INDArray twoByThree = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray rowMean = twoByThree.mean(1);
@@ -304,9 +292,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRowStd(Nd4jBackend backend) {
         INDArray twoByThree = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray rowStd = twoByThree.std(1);
@@ -316,9 +303,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testColumnSumDouble(Nd4jBackend backend) {
         DataType initialType = Nd4j.dataType();
         DataTypeUtil.setDTypeForContext(DataType.DOUBLE);
@@ -330,9 +316,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testColumnVariance(Nd4jBackend backend) {
         INDArray twoByThree = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray columnVar = twoByThree.var(true, 0);
@@ -342,9 +327,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCumSum(Nd4jBackend backend) {
         INDArray n = Nd4j.create(new double[] {1, 2, 3, 4}, new long[] {1, 4});
         INDArray cumSumAnswer = Nd4j.create(new double[] {1, 3, 6, 10}, new long[] {1, 4});
@@ -361,9 +345,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSumRow(Nd4jBackend backend) {
         INDArray rowVector10 = Nd4j.ones(DataType.DOUBLE,1,10);
         INDArray sum1 = rowVector10.sum(1);
@@ -371,9 +354,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
         assertTrue(sum1.getDouble(0) == 10);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSumColumn(Nd4jBackend backend) {
         INDArray colVector10 = Nd4j.ones(10, 1);
         INDArray sum0 = colVector10.sum(0);
@@ -381,9 +363,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
         assertTrue(sum0.getDouble(0) == 10);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSum2d(Nd4jBackend backend) {
         INDArray arr = Nd4j.ones(10, 10);
         INDArray sum0 = arr.sum(0);
@@ -393,9 +374,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[] {10}, sum1.shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSum2dv2(Nd4jBackend backend) {
         INDArray arr = Nd4j.ones(10, 10);
         INDArray sumBoth = arr.sum(0, 1);
@@ -403,9 +383,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
         assertTrue(sumBoth.getDouble(0) == 100);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPermuteReshape(Nd4jBackend backend) {
         INDArray arrTest = Nd4j.arange(60).reshape('c', 3, 4, 5);
         INDArray permute = arrTest.permute(2, 1, 0);
@@ -417,9 +396,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRavel(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 4, 4).reshape(2, 2);
         INDArray asseriton = Nd4j.linspace(1, 4, 4);
@@ -433,9 +411,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPutScalar(Nd4jBackend backend) {
         //Check that the various putScalar methods have the same result...
         val shapes = new int[][] {{3, 4}, {1, 4}, {3, 1}, {3, 4, 5}, {1, 4, 5}, {3, 1, 5}, {3, 4, 1}, {1, 1, 5},
@@ -481,9 +458,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReshapeToTrueScalar_1(Nd4jBackend backend) {
         val orig = Nd4j.create(new float[]{1.0f}, new int[]{1, 1});
         val exp = Nd4j.scalar(1.0f);
@@ -496,9 +472,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, reshaped);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReshapeToTrueScalar_2(Nd4jBackend backend) {
         val orig = Nd4j.create(new float[]{1.0f}, new int[]{1});
         val exp = Nd4j.scalar(1.0f);
@@ -511,9 +486,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, reshaped);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReshapeToTrueScalar_3(Nd4jBackend backend) {
         val orig = Nd4j.create(new float[]{1.0f}, new int[]{1, 1});
         val exp = Nd4j.createFromArray(new float[]{1.0f});
@@ -526,9 +500,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, reshaped);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReshapeToTrueScalar_4(Nd4jBackend backend) {
         val orig = Nd4j.create(new float[]{1.0f}, new int[]{1, 1});
         val exp = Nd4j.scalar(1.0f);
@@ -541,9 +514,8 @@ public class ShapeTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, reshaped);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testViewAfterReshape(Nd4jBackend backend) {
         val x = Nd4j.rand(3,4);
         val x2 = x.ravel();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/StaticShapeTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/StaticShapeTests.java
index 43b3d83e5..9f02c0dee 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/StaticShapeTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/StaticShapeTests.java
@@ -48,9 +48,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class StaticShapeTests extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testShapeInd2Sub(Nd4jBackend backend) {
         long normalTotal = 0;
         long n = 1000;
@@ -69,9 +68,8 @@ public class StaticShapeTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBufferToIntShapeStrideMethods(Nd4jBackend backend) {
         //Specifically: Shape.shape(IntBuffer), Shape.shape(DataBuffer)
         //.isRowVectorShape(DataBuffer), .isRowVectorShape(IntBuffer)
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/TADTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/TADTests.java
index 0a7d9a731..1168ddc87 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/TADTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/TADTests.java
@@ -47,9 +47,8 @@ import static org.nd4j.linalg.indexing.NDArrayIndex.point;
 public class TADTests extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStall(Nd4jBackend backend) {
         //[4, 3, 3, 4, 5, 60, 20, 5, 1, 0, 1, 99], dimensions: [1, 2, 3]
         INDArray arr = Nd4j.create(3, 3, 4, 5);
@@ -63,9 +62,8 @@ public class TADTests extends BaseNd4jTestWithBackends {
      *
      * @throws Exception
      */
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEquality1(Nd4jBackend backend) {
 
         char[] order = new char[] {'c', 'f'};
@@ -120,9 +118,8 @@ public class TADTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMysteriousCrash(Nd4jBackend backend) {
         INDArray arrayF = Nd4j.create(new int[] {1, 1, 4, 4}, 'f');
         INDArray arrayC = Nd4j.create(new int[] {1, 1, 4, 4}, 'c');
@@ -139,9 +136,8 @@ public class TADTests extends BaseNd4jTestWithBackends {
 //                        + javaCTad.shapeInfoDataBuffer());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTADEWSStride(){
         INDArray orig = Nd4j.linspace(1, 600, 600).reshape('f', 10, 1, 60);
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/ConcatTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/ConcatTests.java
index 155a900e7..d3fc86076 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/ConcatTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/ConcatTests.java
@@ -51,9 +51,8 @@ public class ConcatTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcat(Nd4jBackend backend) {
         INDArray A = Nd4j.linspace(1, 8, 8, DataType.DOUBLE).reshape(2, 2, 2);
         INDArray B = Nd4j.linspace(1, 12, 12, DataType.DOUBLE).reshape(3, 2, 2);
@@ -62,9 +61,8 @@ public class ConcatTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcatHorizontally(Nd4jBackend backend) {
         INDArray rowVector = Nd4j.ones(1, 5);
         INDArray other = Nd4j.ones(1, 5);
@@ -75,9 +73,8 @@ public class ConcatTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVStackColumn(Nd4jBackend backend) {
         INDArray linspaced = Nd4j.linspace(1, 3, 3, DataType.DOUBLE).reshape(3, 1);
         INDArray stacked = linspaced.dup();
@@ -87,9 +84,8 @@ public class ConcatTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcatScalars(Nd4jBackend backend) {
         INDArray first = Nd4j.arange(0, 1).reshape(1, 1);
         INDArray second = Nd4j.arange(0, 1).reshape(1, 1);
@@ -100,9 +96,8 @@ public class ConcatTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcatMatrices(Nd4jBackend backend) {
         INDArray a = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray b = a.dup();
@@ -117,9 +112,8 @@ public class ConcatTests extends BaseNd4jTestWithBackends {
         assertEquals(zeroAssertion, concat);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcatRowVectors(Nd4jBackend backend) {
         INDArray rowVector = Nd4j.create(new double[] {1, 2, 3, 4, 5, 6}, new int[] {1, 6});
         INDArray matrix = Nd4j.create(new double[] {7, 8, 9, 10, 11, 12}, new int[] {1, 6});
@@ -134,9 +128,8 @@ public class ConcatTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcat3d(Nd4jBackend backend) {
         INDArray first = Nd4j.linspace(1, 24, 24, DataType.DOUBLE).reshape('c', 2, 3, 4);
         INDArray second = Nd4j.linspace(24, 36, 12, DataType.DOUBLE).reshape('c', 1, 3, 4);
@@ -185,7 +178,7 @@ public class ConcatTests extends BaseNd4jTestWithBackends {
     @Test
     @Disabled
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcat3dv2(Nd4jBackend backend) {
 
         INDArray first = Nd4j.linspace(1, 24, 24, DataType.DOUBLE).reshape('c', 2, 3, 4);
@@ -267,9 +260,8 @@ public class ConcatTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void concatf(){
         char orderBefore = Nd4j.order();
         try {
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/ConcatTestsC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/ConcatTestsC.java
index 6af498231..bb6593b6f 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/ConcatTestsC.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/ConcatTestsC.java
@@ -54,9 +54,8 @@ public class ConcatTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcatVertically(Nd4jBackend backend) {
         INDArray rowVector = Nd4j.ones(1, 5);
         INDArray other = Nd4j.ones(1, 5);
@@ -78,9 +77,8 @@ public class ConcatTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcatScalars(Nd4jBackend backend) {
         INDArray first = Nd4j.arange(0, 1).reshape(1, 1);
         INDArray second = Nd4j.arange(0, 1).reshape(1, 1);
@@ -90,9 +88,8 @@ public class ConcatTestsC extends BaseNd4jTestWithBackends {
         assertTrue(secondRet.isRowVector());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcatScalars1(Nd4jBackend backend) {
         INDArray first = Nd4j.scalar(1);
         INDArray second = Nd4j.scalar(2);
@@ -105,9 +102,8 @@ public class ConcatTestsC extends BaseNd4jTestWithBackends {
         assertEquals(3f, result.getFloat(2), 0.01f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcatVectors1(Nd4jBackend backend) {
         INDArray first = Nd4j.ones(1, 10);
         INDArray second = Nd4j.ones(1, 10);
@@ -125,9 +121,8 @@ public class ConcatTestsC extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcatMatrices(Nd4jBackend backend) {
         INDArray a = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray b = a.dup();
@@ -146,9 +141,8 @@ public class ConcatTestsC extends BaseNd4jTestWithBackends {
         assertEquals(zeroAssertion, concat);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAssign(Nd4jBackend backend) {
         INDArray vector = Nd4j.linspace(1, 5, 5, Nd4j.dataType());
         vector.assign(1);
@@ -165,9 +159,8 @@ public class ConcatTestsC extends BaseNd4jTestWithBackends {
         assertEquals(tensor, ones);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcatRowVectors(Nd4jBackend backend) {
         INDArray rowVector = Nd4j.create(new double[] {1, 2, 3, 4, 5, 6}, new int[] {1, 6});
         INDArray matrix = Nd4j.create(new double[] {7, 8, 9, 10, 11, 12}, new int[] {1, 6});
@@ -182,9 +175,8 @@ public class ConcatTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcat3d(Nd4jBackend backend) {
         INDArray first = Nd4j.linspace(1, 24, 24, Nd4j.dataType()).reshape('c', 2, 3, 4);
         INDArray second = Nd4j.linspace(24, 36, 12, Nd4j.dataType()).reshape('c', 1, 3, 4);
@@ -233,7 +225,7 @@ public class ConcatTestsC extends BaseNd4jTestWithBackends {
 
     @Test()
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcatVector(Nd4jBackend backend) {
         assertThrows(ND4JIllegalStateException.class,() -> {
             Nd4j.concat(0, Nd4j.ones(1,1000000), Nd4j.create(1, 1));
@@ -244,7 +236,7 @@ public class ConcatTestsC extends BaseNd4jTestWithBackends {
     @Test
     @Disabled
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testConcat3dv2(Nd4jBackend backend) {
 
         INDArray first = Nd4j.linspace(1, 24, 24).reshape('c', 2, 3, 4);
@@ -328,9 +320,8 @@ public class ConcatTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLargeConcat(Nd4jBackend backend) {
         val list = new ArrayList<INDArray>();
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/padding/PaddingTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/padding/PaddingTests.java
index b387c870d..e106708cf 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/padding/PaddingTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/padding/PaddingTests.java
@@ -42,9 +42,8 @@ public class PaddingTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAppend(Nd4jBackend backend) {
         INDArray appendTo = Nd4j.ones(DataType.DOUBLE,3, 3);
         INDArray ret = Nd4j.append(appendTo, 3, 1, -1);
@@ -59,9 +58,8 @@ public class PaddingTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPrepend(Nd4jBackend backend) {
         INDArray appendTo = Nd4j.ones(DataType.DOUBLE, 3, 3);
         INDArray ret = Nd4j.append(appendTo, 3, 1, -1);
@@ -77,9 +75,8 @@ public class PaddingTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPad(Nd4jBackend backend) {
 
         INDArray start = Nd4j.linspace(1, 9, 9, DataType.DOUBLE).reshape(3, 3);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/padding/PaddingTestsC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/padding/PaddingTestsC.java
index d9ec9d7a5..ccc04d37c 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/padding/PaddingTestsC.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/concat/padding/PaddingTestsC.java
@@ -46,9 +46,8 @@ public class PaddingTestsC extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPrepend(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray assertion = Nd4j.create(new double[][] {{1, 1, 1, 1, 2}, {1, 1, 1, 3, 4}});
@@ -60,9 +59,8 @@ public class PaddingTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPaddingOneThrougFour(Nd4jBackend backend) {
         int ph = 0;
         int pw = 0;
@@ -82,9 +80,8 @@ public class PaddingTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAppend2(Nd4jBackend backend) {
         INDArray ret = Nd4j.create(new double[] {1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3,
                 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3,
@@ -99,9 +96,8 @@ public class PaddingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(appendAssertion, appended);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPaddingTensor(Nd4jBackend backend) {
         //,1,1,1,1,2,2,0
         int kh = 1, kw = 1, sy = 1, sx = 1, ph = 2, pw = 2;
@@ -119,9 +115,8 @@ public class PaddingTestsC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAppend(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 4, 4, DataType.DOUBLE).reshape(2, 2);
         INDArray otherAppend = Nd4j.append(linspace, 3, 1.0, -1);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/indexing/IndexingTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/indexing/IndexingTests.java
index af8209de3..d72531df1 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/indexing/IndexingTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/indexing/IndexingTests.java
@@ -47,9 +47,8 @@ import static org.junit.jupiter.api.Assertions.*;
 public class IndexingTests extends BaseNd4jTestWithBackends {
 
 
-     @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+     @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGet(Nd4jBackend backend) {
 //        System.out.println("Testing sub-array put and get with a 3D array ...");
 
@@ -110,9 +109,8 @@ public class IndexingTests extends BaseNd4jTestWithBackends {
     /*
         Simple test that checks indexing through different ways that fails
      */
-     @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+     @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSimplePoint(Nd4jBackend backend) {
         INDArray A = Nd4j.linspace(1, 3 * 3 * 3, 3 * 3 * 3).reshape(3, 3, 3);
 
@@ -143,9 +141,8 @@ public class IndexingTests extends BaseNd4jTestWithBackends {
     This is the same as the above test - just tests every possible window with a slice from the 0th dim
     They all fail - so it's possibly unrelated to the value of the index
     */
-     @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+     @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPointIndexing(Nd4jBackend backend) {
         int slices = 5;
         int rows = 5;
@@ -200,9 +197,8 @@ public class IndexingTests extends BaseNd4jTestWithBackends {
         assertEquals(secondAssertion, secondTest);
     }
 
-     @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+     @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void concatGetBug(Nd4jBackend backend) {
         int width = 5;
         int height = 4;
@@ -227,9 +223,8 @@ public class IndexingTests extends BaseNd4jTestWithBackends {
         assertEquals(second, get); //Fails
     }
 
-     @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+     @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testShape(Nd4jBackend backend) {
         INDArray ndarray = Nd4j.create(new float[][] {{1f, 2f}, {3f, 4f}});
         INDArray subarray = ndarray.get(NDArrayIndex.point(0), NDArrayIndex.all());
@@ -238,9 +233,8 @@ public class IndexingTests extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{2}, shape);
     }
 
-     @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+     @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetRows(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 9, 9, DataType.DOUBLE).reshape(3, 3);
         INDArray testAssertion = Nd4j.create(new double[][] {{5, 8}, {6, 9}});
@@ -250,9 +244,8 @@ public class IndexingTests extends BaseNd4jTestWithBackends {
 
     }
 
-     @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+     @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFirstColumn(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new double[][] {{5, 6}, {7, 8}});
 
@@ -262,9 +255,8 @@ public class IndexingTests extends BaseNd4jTestWithBackends {
     }
 
 
-     @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+     @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLinearIndex(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 4, 4).reshape(2, 2);
         for (int i = 0; i < linspace.length(); i++) {
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/indexing/IndexingTestsC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/indexing/IndexingTestsC.java
index 12b3c3b88..df8704477 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/indexing/IndexingTestsC.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/indexing/IndexingTestsC.java
@@ -48,9 +48,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
 
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testExecSubArray(Nd4jBackend backend) {
         INDArray nd = Nd4j.create(new double[] {1, 2, 3, 4, 5, 6}, new int[] {2, 3});
 
@@ -61,9 +60,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLinearViewElementWiseMatching(Nd4jBackend backend) {
         INDArray linspace = Nd4j.linspace(1, 4, 4).reshape(2, 2);
         INDArray dup = linspace.dup();
@@ -71,9 +69,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetRows(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 9, 9, DataType.DOUBLE).reshape(3, 3);
         INDArray testAssertion = Nd4j.create(new double[][] {{4, 5}, {7, 8}});
@@ -83,9 +80,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFirstColumn(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(new double[][] {{5, 7}, {6, 8}});
 
@@ -94,9 +90,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, test);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultiRow(Nd4jBackend backend) {
         INDArray matrix = Nd4j.linspace(1, 9, 9, DataType.DOUBLE).reshape(3, 3);
         INDArray assertion = Nd4j.create(new double[][] {{4, 7}});
@@ -105,9 +100,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, test);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPointIndexes(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(DataType.DOUBLE, 4, 3, 2);
         INDArray get = arr.get(NDArrayIndex.all(), NDArrayIndex.point(1), NDArrayIndex.all());
@@ -124,9 +118,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertion, linspacedGet);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetWithVariedStride(Nd4jBackend backend) {
         int ph = 0;
         int pw = 0;
@@ -176,9 +169,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRowVectorInterval(Nd4jBackend backend) {
         int len = 30;
         INDArray row = Nd4j.zeros(1, len);
@@ -207,9 +199,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
             assertTrue(last10b.getDouble(i) == 20 + i);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test1dSubarray_1(Nd4jBackend backend) {
         val data = Nd4j.linspace(DataType.FLOAT,0, 10, 1);
         val exp = Nd4j.createFromArray(new float[]{3.f, 4.f});
@@ -218,9 +209,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, dataAtIndex);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test1dSubarray_2(Nd4jBackend backend) {
         val data = Nd4j.linspace(DataType.FLOAT,1, 10, 1);
         val exp = Nd4j.createFromArray(new float[]{4.f, 6.f});
@@ -229,9 +219,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(exp, dataAtIndex);
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGet(Nd4jBackend backend) {
 //        System.out.println("Testing sub-array put and get with a 3D array ...");
 
@@ -288,9 +277,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
 //        System.out.println("... done");
     }
 
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSimplePoint(Nd4jBackend backend) {
         INDArray A = Nd4j.linspace(1, 3 * 3 * 3, 3 * 3 * 3).reshape(3, 3, 3);
 
@@ -316,9 +304,8 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
         This is the same as the above test - just tests every possible window with a slice from the 0th dim
         They all fail - so it's possibly unrelated to the value of the index
      */
-      @Test
-    @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+      @ParameterizedTest
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPointIndexing(Nd4jBackend backend) {
         int slices = 5;
         int rows = 5;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ones/LeadingAndTrailingOnes.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ones/LeadingAndTrailingOnes.java
index c7f63053e..01c294f72 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ones/LeadingAndTrailingOnes.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ones/LeadingAndTrailingOnes.java
@@ -42,9 +42,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class LeadingAndTrailingOnes extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSliceConstructor(Nd4jBackend backend) {
         List<INDArray> testList = new ArrayList<>();
         for (int i = 0; i < 5; i++)
@@ -55,9 +54,8 @@ public class LeadingAndTrailingOnes extends BaseNd4jTestWithBackends {
         assertEquals(expected, test);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLeadAndTrail(Nd4jBackend backend) {
         INDArray fourD = Nd4j.create(1, 2, 1, 1);
         assertEquals(2, fourD.length());
@@ -66,9 +64,8 @@ public class LeadingAndTrailingOnes extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCreateLeadingAndTrailingOnes(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(1, 10, 1, 1);
         arr.assign(1);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ones/LeadingAndTrailingOnesC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ones/LeadingAndTrailingOnesC.java
index 424b181be..5dc4351db 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ones/LeadingAndTrailingOnesC.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/ones/LeadingAndTrailingOnesC.java
@@ -39,18 +39,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class LeadingAndTrailingOnesC extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCreateLeadingAndTrailingOnes(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(1, 10, 1, 1);
         arr.assign(1);
 //        System.out.println(arr);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatrix(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 4, 4).reshape(2, 2);
         INDArray slice1 = arr.slice(1);
@@ -66,9 +64,8 @@ public class LeadingAndTrailingOnesC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultipleOnesInMiddle(Nd4jBackend backend) {
         INDArray tensor = Nd4j.linspace(1, 144, 144).reshape(2, 2, 1, 1, 6, 6);
         INDArray tensorSlice1 = tensor.slice(1);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/reshape/ReshapeTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/reshape/ReshapeTests.java
index ce184a659..b2a7df195 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/reshape/ReshapeTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/shape/reshape/ReshapeTests.java
@@ -31,9 +31,9 @@ import org.nd4j.linalg.api.ndarray.INDArray;
 import org.nd4j.linalg.factory.Nd4j;
 import org.nd4j.linalg.factory.Nd4jBackend;
 
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.Assume.assumeNotNull;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assumptions.*;
 
 /**
  * @author Adam Gibson
@@ -43,9 +43,8 @@ import static org.junit.Assume.assumeNotNull;
 public class ReshapeTests extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testThreeTwoTwoTwo(Nd4jBackend backend) {
         INDArray threeTwoTwo = Nd4j.linspace(1, 12, 12, DataType.DOUBLE).reshape(3, 2, 2);
         INDArray sliceZero = Nd4j.create(new double[][] {{1, 7}, {4, 10}});
@@ -66,9 +65,8 @@ public class ReshapeTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testColumnVectorReshape(Nd4jBackend backend) {
         double delta = 1e-1;
         INDArray arr = Nd4j.create(1, 3);
@@ -77,7 +75,7 @@ public class ReshapeTests extends BaseNd4jTestWithBackends {
         assertEquals(0.0, reshaped.getDouble(1), delta);
         assertEquals(0.0, reshaped.getDouble(2), delta);
         log.info("Reshaped: {}", reshaped.shapeInfoDataBuffer().asInt());
-        assumeNotNull(reshaped.toString());
+        assertNotNull(reshaped.toString());
     }
 
     @Override
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/slicing/SlicingTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/slicing/SlicingTests.java
index a8faf7470..5eba51cd3 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/slicing/SlicingTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/slicing/SlicingTests.java
@@ -39,9 +39,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class SlicingTests extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSlices() {
         INDArray arr = Nd4j.create(Nd4j.linspace(1, 24, 24, DataType.DOUBLE).data(), new int[] {4, 3, 2});
         for (int i = 0; i < arr.slices(); i++) {
@@ -54,9 +53,8 @@ public class SlicingTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSlice() {
         INDArray arr = Nd4j.linspace(1, 24, 24, DataType.DOUBLE).reshape(4, 3, 2);
         INDArray assertion = Nd4j.create(new double[][] {{1, 13}, {5, 17}, {9, 21}});
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/slicing/SlicingTestsC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/slicing/SlicingTestsC.java
index b273d5196..f70821595 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/slicing/SlicingTestsC.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/slicing/SlicingTestsC.java
@@ -42,9 +42,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class SlicingTestsC extends BaseNd4jTestWithBackends {
     
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSliceRowVector(Nd4jBackend backend) {
         INDArray arr = Nd4j.zeros(5);
 //        System.out.println(arr.slice(1));
@@ -52,9 +51,8 @@ public class SlicingTestsC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSliceAssertion(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 30, 30).reshape(3, 5, 2);
         INDArray firstRow = arr.slice(0).slice(0);
@@ -64,9 +62,8 @@ public class SlicingTestsC extends BaseNd4jTestWithBackends {
 //        System.out.println(firstRow);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSliceShape(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 30, 30, DataType.DOUBLE).reshape(3, 5, 2);
 
@@ -95,9 +92,8 @@ public class SlicingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(assertionTwo, sliceTest);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSwapReshape(Nd4jBackend backend) {
         INDArray n2 = Nd4j.create(Nd4j.linspace(1, 30, 30, DataType.FLOAT).data(), new int[] {3, 5, 2});
         INDArray swapped = n2.swapAxes(n2.shape().length - 1, 1);
@@ -118,9 +114,8 @@ public class SlicingTestsC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGetRow(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 6, 6, DataType.DOUBLE).reshape(2, 3);
         INDArray get = arr.getRow(1);
@@ -138,9 +133,8 @@ public class SlicingTestsC extends BaseNd4jTestWithBackends {
         assertEquals(threeByThreeAssertion, offsetTest);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVectorIndexing(Nd4jBackend backend) {
         INDArray zeros = Nd4j.create(1, 400000);
         INDArray get = zeros.get(NDArrayIndex.point(0), NDArrayIndex.interval(0, 300000));
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/CudaTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/CudaTests.java
index eedcd8fab..09540f291 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/CudaTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/CudaTests.java
@@ -53,9 +53,8 @@ public class CudaTests extends BaseNd4jTestWithBackends {
             Nd4j.setDataType(initialType);
         }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMGrid_1(Nd4jBackend backend) {
         if (!(Nd4j.getExecutioner() instanceof GridExecutioner))
             return;
@@ -76,9 +75,8 @@ public class CudaTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMGrid_2(Nd4jBackend backend) {
         if (!(Nd4j.getExecutioner() instanceof GridExecutioner))
             return;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/LongTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/LongTests.java
index 85eae255f..4793043bb 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/LongTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/LongTests.java
@@ -49,9 +49,8 @@ public class LongTests extends BaseNd4jTestWithBackends {
 
     DataType initialType = Nd4j.dataType();
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSomething1(Nd4jBackend backend) {
         // we create 2D array, total nr. of elements is 2.4B elements, > MAX_INT
         INDArray huge = Nd4j.create(8000000, 300);
@@ -77,9 +76,8 @@ public class LongTests extends BaseNd4jTestWithBackends {
         assertNotEquals(rowA, rowB);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSomething2(Nd4jBackend backend) {
         // we create 2D array, total nr. of elements is 2.4B elements, > MAX_INT
         INDArray huge = Nd4j.create(100, 10);
@@ -105,9 +103,8 @@ public class LongTests extends BaseNd4jTestWithBackends {
         assertNotEquals(rowA, rowB);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLongTadOffsets1(Nd4jBackend backend) {
         INDArray huge = Nd4j.create(230000000, 10);
 
@@ -116,9 +113,8 @@ public class LongTests extends BaseNd4jTestWithBackends {
         assertEquals(230000000, tad.getSecond().length());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLongTadOp1(Nd4jBackend backend) {
 
         double exp = Transforms.manhattanDistance(Nd4j.create(1000).assign(1.0), Nd4j.create(1000).assign(2.0));
@@ -136,9 +132,8 @@ public class LongTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLongTadOp2(Nd4jBackend backend) {
 
         INDArray hugeX = Nd4j.create(2300000, 1000).assign(1.0);
@@ -149,9 +144,8 @@ public class LongTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLongTadOp2_micro(Nd4jBackend backend) {
 
         INDArray hugeX = Nd4j.create(230, 1000).assign(1.0);
@@ -162,9 +156,8 @@ public class LongTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLongTadOp3(Nd4jBackend backend) {
 
         INDArray hugeX = Nd4j.create(2300000, 1000).assign(1.0);
@@ -175,9 +168,8 @@ public class LongTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLongTadOp4(Nd4jBackend backend) {
 
         INDArray hugeX = Nd4j.create(2300000, 1000).assign(1.0);
@@ -188,9 +180,8 @@ public class LongTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLongTadOp5(Nd4jBackend backend) {
 
         List<INDArray> list = new ArrayList<>();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/RavelIndexTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/RavelIndexTest.java
index e59d81d6f..235e04c72 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/RavelIndexTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/RavelIndexTest.java
@@ -23,7 +23,7 @@ package org.nd4j.linalg.specials;
 import lombok.extern.slf4j.Slf4j;
 import org.bytedeco.javacpp.LongPointer;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.Assert;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -36,6 +36,9 @@ import org.nd4j.linalg.factory.Nd4j;
 import org.nd4j.linalg.factory.Nd4jBackend;
 import org.nd4j.nativeblas.NativeOpsHolder;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
 
 @Slf4j
 
@@ -60,9 +63,8 @@ public class RavelIndexTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void ravelIndexesTest(Nd4jBackend backend) {
         // FIXME: we don't want this test running on cuda for now
         if (Nd4j.getExecutioner().getClass().getCanonicalName().toLowerCase().contains("cuda"))
@@ -139,12 +141,12 @@ public class RavelIndexTest extends BaseNd4jTestWithBackends {
         NativeOpsHolder.getInstance().getDeviceNativeOps().ravelMultiIndex(null, (LongPointer) multiIdxDB.addressPointer(),
                 (LongPointer) resultFlat.addressPointer(), length, (LongPointer) shapeInfo.addressPointer(),clipMode);
 
-        Assert.assertArrayEquals(flatIdxArray, resultFlat.asLong());
+        assertArrayEquals(flatIdxArray, resultFlat.asLong());
 
         NativeOpsHolder.getInstance().getDeviceNativeOps().unravelIndex(null, (LongPointer) resultMulti.addressPointer(),
                 (LongPointer) flatIdxDB.addressPointer(), length, (LongPointer) shapeInfo.addressPointer());
 
-        Assert.assertArrayEquals(multiIdxArray, resultMulti.asLong());
+        assertArrayEquals(multiIdxArray, resultMulti.asLong());
 
 
         //testing various clipMode cases
@@ -154,7 +156,7 @@ public class RavelIndexTest extends BaseNd4jTestWithBackends {
             shapeInfo = Nd4j.getShapeInfoProvider().createShapeInformation(shape, DataType.FLOAT).getFirst();
             NativeOpsHolder.getInstance().getDeviceNativeOps().ravelMultiIndex(null, (LongPointer) multiIdxDB.addressPointer(),
                     (LongPointer) resultFlat.addressPointer(), length, (LongPointer) shapeInfo.addressPointer(),clipMode);
-            Assert.fail("No exception thrown while using CLIP_MODE_THROW.");
+            fail("No exception thrown while using CLIP_MODE_THROW.");
 
         } catch (RuntimeException e) {
             //OK
@@ -168,7 +170,7 @@ public class RavelIndexTest extends BaseNd4jTestWithBackends {
 
         NativeOpsHolder.getInstance().getDeviceNativeOps().ravelMultiIndex(null, (LongPointer) multiIdxDB.addressPointer(),
                 (LongPointer) resultFlat.addressPointer(), length, (LongPointer) shapeInfo.addressPointer(), clipMode);
-        Assert.assertArrayEquals(new long[] {22, 17, 15}, resultFlat.asLong());
+        assertArrayEquals(new long[] {22, 17, 15}, resultFlat.asLong());
 
         // clipMode = 2: clip to shape
         clipMode = 2;
@@ -180,7 +182,7 @@ public class RavelIndexTest extends BaseNd4jTestWithBackends {
         NativeOpsHolder.getInstance().getDeviceNativeOps().ravelMultiIndex(null, (LongPointer) multiIdxDB.addressPointer(),
                 (LongPointer) resultFlat.addressPointer(), length, (LongPointer) shapeInfo.addressPointer(), clipMode);
 
-        Assert.assertArrayEquals(new long[] {22, 23, 23}, resultFlat.asLong());
+        assertArrayEquals(new long[] {22, 23, 23}, resultFlat.asLong());
 
 
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/SortCooTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/SortCooTests.java
index eef65331a..3811539d3 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/SortCooTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/SortCooTests.java
@@ -62,9 +62,8 @@ public class SortCooTests extends BaseNd4jTestWithBackends {
         Nd4j.setDefaultDataTypes(initialType, Nd4j.defaultFloatingPointType());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void sortSparseCooIndicesSort1(Nd4jBackend backend) {
         // FIXME: we don't want this test running on cuda for now
         if (Nd4j.getExecutioner().getClass().getCanonicalName().toLowerCase().contains("cuda"))
@@ -98,9 +97,8 @@ public class SortCooTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void sortSparseCooIndicesSort2(Nd4jBackend backend) {
         // FIXME: we don't want this test running on cuda for now
         if (Nd4j.getExecutioner().getClass().getCanonicalName().toLowerCase().contains("cuda"))
@@ -147,9 +145,8 @@ public class SortCooTests extends BaseNd4jTestWithBackends {
         return LongStream.range(i, i + length).map(buffer::getLong).toArray();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void sortSparseCooIndicesSort3(Nd4jBackend backend) {
         // FIXME: we don't want this test running on cuda for now
         if (Nd4j.getExecutioner().getClass().getCanonicalName().toLowerCase().contains("cuda"))
@@ -187,9 +184,8 @@ public class SortCooTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void sortSparseCooIndicesSort4(Nd4jBackend backend) {
         // FIXME: we don't want this test running on cuda for now
         if (Nd4j.getExecutioner().getClass().getCanonicalName().toLowerCase().contains("cuda"))
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/DataSetUtilsTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/DataSetUtilsTest.java
index 04569daf0..eaea0b5c1 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/DataSetUtilsTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/DataSetUtilsTest.java
@@ -55,7 +55,7 @@ public class DataSetUtilsTest extends BaseNd4jTestWithBackends {
 	//
 	@Test
 	@ParameterizedTest
-	@MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+	@MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
 	public void testAll(@TempDir Path tmpFld,Nd4jBackend backend) {
 		//
 		sis = new SIS();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/NDArrayUtilTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/NDArrayUtilTest.java
index be46fa226..0504620d6 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/NDArrayUtilTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/NDArrayUtilTest.java
@@ -39,18 +39,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class NDArrayUtilTest extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMatrixConversion(Nd4jBackend backend) {
         int[][] nums = {{1, 2}, {3, 4}, {5, 6}};
         INDArray result = NDArrayUtil.toNDArray(nums);
         assertArrayEquals(new long[]{2,3}, result.shape());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVectorConversion(Nd4jBackend backend) {
         int[] nums = {1, 2, 3, 4};
         INDArray result = NDArrayUtil.toNDArray(nums);
@@ -58,9 +56,8 @@ public class NDArrayUtilTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFlattenArray1(Nd4jBackend backend) {
         float[][][] arrX = new float[2][2][2];
 
@@ -69,9 +66,8 @@ public class NDArrayUtilTest extends BaseNd4jTestWithBackends {
         assertEquals(8, arrZ.length);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFlattenArray2(Nd4jBackend backend) {
         float[][][] arrX = new float[5][4][3];
 
@@ -81,9 +77,8 @@ public class NDArrayUtilTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFlattenArray3(Nd4jBackend backend) {
         float[][][] arrX = new float[5][2][3];
 
@@ -92,9 +87,8 @@ public class NDArrayUtilTest extends BaseNd4jTestWithBackends {
         assertEquals(30, arrZ.length);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFlattenArray4(Nd4jBackend backend) {
         float[][][][] arrX = new float[5][2][3][3];
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/PreconditionsTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/PreconditionsTest.java
index 0922cb9e2..7ec6d6370 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/PreconditionsTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/PreconditionsTest.java
@@ -37,9 +37,8 @@ import static org.junit.jupiter.api.Assertions.fail;
 
 public class PreconditionsTest extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void test(Nd4jBackend backend){
 
         INDArray arr = Nd4j.linspace(1,60,60).reshape('c',3,4,5);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/ShapeTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/ShapeTest.java
index 6162e05e5..e2894518f 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/ShapeTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/ShapeTest.java
@@ -40,9 +40,8 @@ public class ShapeTest extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToOffsetZero(Nd4jBackend backend) {
         INDArray matrix = Nd4j.rand(3, 5);
         INDArray rowOne = matrix.getRow(1);
@@ -62,9 +61,8 @@ public class ShapeTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDupLeadingTrailingZeros(Nd4jBackend backend) {
         testDupHelper(1, 10);
         testDupHelper(10, 1);
@@ -85,9 +83,8 @@ public class ShapeTest extends BaseNd4jTestWithBackends {
         assertTrue(arr.equals(arr2));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLeadingOnes(Nd4jBackend backend) {
         INDArray arr = Nd4j.create(1, 5, 5);
         assertEquals(1, arr.getLeadingOnes());
@@ -97,9 +94,8 @@ public class ShapeTest extends BaseNd4jTestWithBackends {
         assertEquals(2, arr4.getLeadingOnes());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTrailingOnes(Nd4jBackend backend) {
         INDArray arr2 = Nd4j.create(5, 5, 1);
         assertEquals(1, arr2.getTrailingOnes());
@@ -107,9 +103,8 @@ public class ShapeTest extends BaseNd4jTestWithBackends {
         assertEquals(2, arr4.getTrailingOnes());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testElementWiseCompareOnesInMiddle(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 6, 6).reshape(2, 3);
         INDArray onesInMiddle = Nd4j.linspace(1, 6, 6).reshape(2, 1, 3);
@@ -121,9 +116,8 @@ public class ShapeTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSumLeadingTrailingZeros(Nd4jBackend backend) {
         testSumHelper(1, 5, 5);
         testSumHelper(5, 5, 1);
@@ -153,9 +147,8 @@ public class ShapeTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testEqualsWithSqueeze(){
 
         assertTrue(Shape.shapeEqualWithSqueeze(null, null));
@@ -176,9 +169,8 @@ public class ShapeTest extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testShapeOrder(){
         long[] shape = {2,2};
         long[] stride = {1,8};  //Ascending strides -> F order
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/ShapeTestC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/ShapeTestC.java
index 67435acf1..4866e5c3e 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/ShapeTestC.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/ShapeTestC.java
@@ -46,9 +46,8 @@ public class ShapeTestC extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToOffsetZero(Nd4jBackend backend) {
         INDArray matrix = Nd4j.rand(3, 5);
         INDArray rowOne = matrix.getRow(1);
@@ -67,9 +66,8 @@ public class ShapeTestC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTile(Nd4jBackend backend) {
         INDArray arr = Nd4j.scalar(DataType.DOUBLE, 1.0).reshape(1, 1);
         //INDArray[] inputs, INDArray[] outputs, int[] axis
@@ -81,9 +79,8 @@ public class ShapeTestC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testElementWiseCompareOnesInMiddle(Nd4jBackend backend) {
         INDArray arr = Nd4j.linspace(1, 6, 6).reshape(2, 3);
         INDArray onesInMiddle = Nd4j.linspace(1, 6, 6).reshape(2, 1, 3);
@@ -92,9 +89,8 @@ public class ShapeTestC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testKeepDimsShape_1_T(Nd4jBackend backend) {
         val shape = new int[]{5, 5};
         val axis = new int[]{1, 0, 1};
@@ -104,9 +100,8 @@ public class ShapeTestC extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{1, 1}, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testKeepDimsShape_1_F(Nd4jBackend backend) {
         val shape = new int[]{5, 5};
         val axis = new int[]{0, 0, 1};
@@ -116,9 +111,8 @@ public class ShapeTestC extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{}, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testKeepDimsShape_2_T(Nd4jBackend backend) {
         val shape = new int[]{5, 5, 5};
         val axis = new int[]{1, 0, 1};
@@ -128,9 +122,8 @@ public class ShapeTestC extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{1, 1, 5}, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testKeepDimsShape_2_F(Nd4jBackend backend) {
         val shape = new int[]{5, 5, 5};
         val axis = new int[]{0, 0, 1};
@@ -141,9 +134,8 @@ public class ShapeTestC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testKeepDimsShape_3_T(Nd4jBackend backend) {
         val shape = new int[]{1, 1};
         val axis = new int[]{1, 0, 1};
@@ -153,9 +145,8 @@ public class ShapeTestC extends BaseNd4jTestWithBackends {
         assertArrayEquals(new long[]{1, 1}, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testKeepDimsShape_3_F(Nd4jBackend backend) {
         val shape = new int[]{1, 1};
         val axis = new int[]{0, 0};
@@ -168,9 +159,8 @@ public class ShapeTestC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testKeepDimsShape_4_F(Nd4jBackend backend) {
         val shape = new int[]{4, 4};
         val axis = new int[]{0, 0};
@@ -183,9 +173,8 @@ public class ShapeTestC extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAxisNormalization_1(Nd4jBackend backend) {
         val axis = new int[] {1, -2};
         val rank = 2;
@@ -195,9 +184,8 @@ public class ShapeTestC extends BaseNd4jTestWithBackends {
         assertArrayEquals(exp, norm);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAxisNormalization_2(Nd4jBackend backend) {
         val axis = new int[] {1, -2, 0};
         val rank = 2;
@@ -220,9 +208,8 @@ public class ShapeTestC extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAxisNormalization_4(Nd4jBackend backend) {
         val axis = new int[] {1, 2, 0};
         val rank = 3;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/TestArrayUtils.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/TestArrayUtils.java
index 4bc48ab11..d37178421 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/TestArrayUtils.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/TestArrayUtils.java
@@ -34,9 +34,8 @@ import static org.junit.jupiter.api.Assertions.*;
 public class TestArrayUtils extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFlattenDoubleArray(Nd4jBackend backend) {
         assertArrayEquals(new double[0], ArrayUtil.flattenDoubleArray(new double[0]), 0.0);
         Random r = new Random(12345L);
@@ -84,9 +83,8 @@ public class TestArrayUtils extends BaseNd4jTestWithBackends {
         assertArrayEquals(exp4, ArrayUtil.flattenDoubleArray(d4), 0.0);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFlattenFloatArray(Nd4jBackend backend) {
         assertArrayEquals(new float[0], ArrayUtil.flattenFloatArray(new float[0]), 0.0f);
         Random r = new Random(12345L);
@@ -134,9 +132,8 @@ public class TestArrayUtils extends BaseNd4jTestWithBackends {
         assertArrayEquals(exp4, ArrayUtil.flattenFloatArray(f4), 0.0f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArrayShape(Nd4jBackend backend) {
         assertArrayEquals(ArrayUtil.arrayShape(new int[0]), new int[] {0});
         assertArrayEquals(ArrayUtil.arrayShape(new int[5][7][9]), new int[] {5, 7, 9});
@@ -147,9 +144,8 @@ public class TestArrayUtils extends BaseNd4jTestWithBackends {
         assertArrayEquals(ArrayUtil.arrayShape(new String[3][2][1]), new int[] {3, 2, 1});
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArgMinOfMaxMethods(Nd4jBackend backend) {
         int[] first = {1, 5, 2, 4};
         int[] second = {4, 6, 3, 2};
@@ -160,9 +156,8 @@ public class TestArrayUtils extends BaseNd4jTestWithBackends {
         assertEquals(1, ArrayUtil.argMinOfMax(first, second, third));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAssertNotRagged(Nd4jBackend backend){
 
         //Rank 1 - should be fine
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/TestCollections.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/TestCollections.java
index 9a8334527..f7e880c26 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/TestCollections.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/TestCollections.java
@@ -34,9 +34,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TestCollections extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCompactHeapStringList(Nd4jBackend backend) {
 
         int[] reallocSizeBytes = new int[] {1024, 1048576};
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/ValidationUtilTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/ValidationUtilTests.java
index cd19f1793..9b17b0d6e 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/ValidationUtilTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/util/ValidationUtilTests.java
@@ -51,9 +51,8 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class ValidationUtilTests extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testFileValidation(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         File f = testDir.toFile();
 
@@ -89,9 +88,8 @@ public class ValidationUtilTests extends BaseNd4jTestWithBackends {
 //        System.out.println(vr3.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testZipValidation(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         File f = testDir.toFile();
 
@@ -141,9 +139,8 @@ public class ValidationUtilTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testINDArrayTextValidation(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         File f = testDir.toFile();
 
@@ -284,9 +281,8 @@ public class ValidationUtilTests extends BaseNd4jTestWithBackends {
 //        System.out.println(vr4.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNpzValidation(@TempDir Path testDIr,Nd4jBackend backend) throws Exception {
 
         File f = testDIr.toFile();
@@ -355,9 +351,8 @@ public class ValidationUtilTests extends BaseNd4jTestWithBackends {
 //        System.out.println(vr4.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNumpyTxtValidation(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         File f = testDir.toFile();
 
@@ -425,9 +420,8 @@ public class ValidationUtilTests extends BaseNd4jTestWithBackends {
 //        System.out.println(vr4.toString());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testValidateSameDiff(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         Nd4j.setDataType(DataType.FLOAT);
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/BasicWorkspaceTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/BasicWorkspaceTests.java
index 3adc87262..0a667310f 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/BasicWorkspaceTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/BasicWorkspaceTests.java
@@ -88,9 +88,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         Nd4j.setDataType(initialType);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCold(Nd4jBackend backend) {
         INDArray array = Nd4j.create(10);
 
@@ -99,9 +98,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         assertEquals(10f, array.sumNumber().floatValue(), 0.01f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMinSize1(Nd4jBackend backend) {
         WorkspaceConfiguration conf = WorkspaceConfiguration.builder().minSize(10 * 1024 * 1024)
                         .overallocationLimit(1.0).policyAllocation(AllocationPolicy.OVERALLOCATE)
@@ -121,9 +119,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBreakout2(Nd4jBackend backend) {
 
         assertEquals(null, Nd4j.getMemoryManager().getCurrentWorkspace());
@@ -135,9 +132,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         assertEquals(null, Nd4j.getMemoryManager().getCurrentWorkspace());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBreakout1(Nd4jBackend backend) {
 
         assertEquals(null, Nd4j.getMemoryManager().getCurrentWorkspace());
@@ -167,9 +163,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLeverage3(Nd4jBackend backend) {
         try (Nd4jWorkspace wsOne =
                         (Nd4jWorkspace) Nd4j.getWorkspaceManager().getAndActivateWorkspace(basicConfig, "EXT")) {
@@ -190,9 +185,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLeverageTo2(Nd4jBackend backend) {
         val exp = Nd4j.scalar(15.0);
         try (Nd4jWorkspace wsOne =
@@ -226,9 +220,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLeverageTo1(Nd4jBackend backend) {
         try (Nd4jWorkspace wsOne =
                         (Nd4jWorkspace) Nd4j.getWorkspaceManager().getAndActivateWorkspace(basicConfig, "EXT")) {
@@ -248,9 +241,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOutOfScope1(Nd4jBackend backend) {
         try (Nd4jWorkspace wsOne =
                         (Nd4jWorkspace) Nd4j.getWorkspaceManager().getAndActivateWorkspace(basicConfig, "EXT")) {
@@ -280,9 +272,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLeverage1(Nd4jBackend backend) {
         try (Nd4jWorkspace wsOne =
                         (Nd4jWorkspace) Nd4j.getWorkspaceManager().getAndActivateWorkspace(basicConfig, "EXT")) {
@@ -313,9 +304,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNoShape1(Nd4jBackend backend) {
         int outDepth = 50;
         int miniBatch = 64;
@@ -336,9 +326,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCreateDetached1(Nd4jBackend backend) {
         try (Nd4jWorkspace wsI =
                         (Nd4jWorkspace) Nd4j.getWorkspaceManager().getAndActivateWorkspace(basicConfig, "ITER")) {
@@ -361,9 +350,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDetach1(Nd4jBackend backend) {
         INDArray array = null;
         INDArray copy = null;
@@ -393,9 +381,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         assertFalse(array == copy);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScope2(Nd4jBackend backend) {
         INDArray array = null;
         try (Nd4jWorkspace wsI =
@@ -419,9 +406,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         assertFalse(array.isInScope());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScope1(Nd4jBackend backend) {
         INDArray array = null;
         try (Nd4jWorkspace wsI =
@@ -434,9 +420,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         assertFalse(array.isInScope());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIsAttached3(Nd4jBackend backend) {
         INDArray array = Nd4j.create(DOUBLE, 100);
         try (Nd4jWorkspace wsI =
@@ -454,9 +439,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         assertFalse(array2.isAttached());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIsAttached2(Nd4jBackend backend) {
         INDArray array = Nd4j.create(DOUBLE, 100);
         try (Nd4jWorkspace wsI =
@@ -473,9 +457,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         assertFalse(array2.isAttached());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIsAttached1(Nd4jBackend backend) {
 
         try (Nd4jWorkspace wsI =
@@ -490,9 +473,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         assertFalse(array.isAttached());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOverallocation3(Nd4jBackend backend) {
         WorkspaceConfiguration overallocationConfig = WorkspaceConfiguration.builder().initialSize(0)
                         .maxSize(10 * 1024 * 1024).overallocationLimit(1.0)
@@ -520,9 +502,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         assertEquals(200 * Nd4j.sizeOfDataType(DOUBLE), workspace.getCurrentSize());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOverallocation2(Nd4jBackend backend) {
         WorkspaceConfiguration overallocationConfig = WorkspaceConfiguration.builder().initialSize(0)
                         .maxSize(10 * 1024 * 1024).overallocationLimit(1.0)
@@ -543,9 +524,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         assertEquals(200 * Nd4j.sizeOfDataType(DOUBLE), workspace.getCurrentSize());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testOverallocation1(Nd4jBackend backend) {
         WorkspaceConfiguration overallocationConfig = WorkspaceConfiguration.builder().initialSize(1024)
                         .maxSize(10 * 1024 * 1024).overallocationLimit(1.0)
@@ -557,9 +537,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         assertEquals(2048, workspace.getCurrentSize());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToggle1(Nd4jBackend backend) {
         Nd4jWorkspace workspace = (Nd4jWorkspace) Nd4j.getWorkspaceManager().createNewWorkspace(loopFirstConfig);
 
@@ -613,9 +592,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLoop4(Nd4jBackend backend) {
         Nd4jWorkspace workspace = (Nd4jWorkspace) Nd4j.getWorkspaceManager().createNewWorkspace(loopFirstConfig);
 
@@ -642,9 +620,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         assertEquals(0, workspace.getPrimaryOffset());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLoops3(Nd4jBackend backend) {
         Nd4jWorkspace workspace = (Nd4jWorkspace) Nd4j.getWorkspaceManager().createNewWorkspace(loopFirstConfig);
 
@@ -671,9 +648,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         assertEquals(reqMem + reqMem % 8, workspace.getCurrentSize());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLoops2(Nd4jBackend backend) {
         Nd4jWorkspace workspace = (Nd4jWorkspace) Nd4j.getWorkspaceManager().createNewWorkspace(loopOverTimeConfig);
 
@@ -711,9 +687,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         workspace.notifyScopeLeft();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLoops1(Nd4jBackend backend) {
         Nd4jWorkspace workspace = (Nd4jWorkspace) Nd4j.getWorkspaceManager().createNewWorkspace(loopOverTimeConfig);
 
@@ -768,9 +743,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllocation6(Nd4jBackend backend) {
         Nd4jWorkspace workspace = (Nd4jWorkspace) Nd4j.getWorkspaceManager().getAndActivateWorkspace(basicConfig, "testAllocation6");
 
@@ -794,9 +768,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         workspace.close();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllocation5(Nd4jBackend backend) {
         Nd4jWorkspace workspace = (Nd4jWorkspace) Nd4j.getWorkspaceManager().getAndActivateWorkspace(basicConfig, "testAllocation5");
 
@@ -824,9 +797,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllocation4(Nd4jBackend backend) {
         WorkspaceConfiguration failConfig = WorkspaceConfiguration.builder().initialSize(1024 * 1024)
                         .maxSize(1024 * 1024).overallocationLimit(0.1).policyAllocation(AllocationPolicy.STRICT)
@@ -862,9 +834,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         assertEquals((reqMem + reqMem % 16) * 2, workspace.getPrimaryOffset());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllocation3(Nd4jBackend backend) {
         Nd4jWorkspace workspace = (Nd4jWorkspace) Nd4j.getWorkspaceManager().getAndActivateWorkspace(basicConfig,
                         "testAllocation2");
@@ -888,9 +859,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         workspace.close();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllocation2(Nd4jBackend backend) {
         Nd4jWorkspace workspace = (Nd4jWorkspace) Nd4j.getWorkspaceManager().getAndActivateWorkspace(basicConfig,
                         "testAllocation2");
@@ -914,9 +884,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         workspace.close();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAllocation1(Nd4jBackend backend) {
 
 
@@ -988,9 +957,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmap1(Nd4jBackend backend) {
         // we don't support MMAP on cuda yet
         if (Nd4j.getExecutioner().getClass().getName().toLowerCase().contains("cuda"))
@@ -1024,7 +992,7 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
     @Test
     @Disabled
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmap2(Nd4jBackend backend) throws Exception {
         // we don't support MMAP on cuda yet
         if (Nd4j.getExecutioner().getClass().getName().toLowerCase().contains("cuda"))
@@ -1050,9 +1018,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInvalidLeverageMigrateDetach(Nd4jBackend backend){
 
         try {
@@ -1158,9 +1125,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBadGenerationLeverageMigrateDetach(Nd4jBackend backend){
         INDArray gen2 = null;
 
@@ -1265,9 +1231,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDtypeLeverage(Nd4jBackend backend){
 
         for(DataType globalDtype : new DataType[]{DataType.DOUBLE, DataType.FLOAT, DataType.HALF}) {
@@ -1296,9 +1261,8 @@ public class BasicWorkspaceTests extends BaseNd4jTestWithBackends {
         Nd4j.getWorkspaceManager().destroyAllWorkspacesForCurrentThread();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCircularWorkspaceAsymmetry_1(Nd4jBackend backend) {
         // nothing to test on CPU here
         if (Nd4j.getEnvironment().isCPU())
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/CudaWorkspaceTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/CudaWorkspaceTests.java
index aac547e9d..3811a0ce4 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/CudaWorkspaceTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/CudaWorkspaceTests.java
@@ -43,9 +43,8 @@ public class CudaWorkspaceTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWorkspaceReuse() {
         if (Nd4j.getExecutioner().type() != OpExecutioner.ExecutionerType.CUDA)
             return;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/CyclicWorkspaceTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/CyclicWorkspaceTests.java
index 9f1cb93ba..f3df3399e 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/CyclicWorkspaceTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/CyclicWorkspaceTests.java
@@ -40,9 +40,8 @@ import org.nd4j.linalg.factory.Nd4jBackend;
 
 public class CyclicWorkspaceTests extends BaseNd4jTestWithBackends {
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasicMechanics_1(Nd4jBackend backend) {
         val fShape = new long[]{128, 784};
         val lShape = new long[] {128, 10};
@@ -65,7 +64,7 @@ public class CyclicWorkspaceTests extends BaseNd4jTestWithBackends {
     @Test
     @Disabled
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testGc(Nd4jBackend backend) {
         val indArray = Nd4j.create(4, 4);
         indArray.putRow(0, Nd4j.create(new float[]{0, 2, -2, 0}));
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/DebugModeTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/DebugModeTests.java
index a990069ce..00ee07c24 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/DebugModeTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/DebugModeTests.java
@@ -66,9 +66,8 @@ public class DebugModeTests extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDebugMode_1(Nd4jBackend backend) {
         assertEquals(DebugMode.DISABLED, Nd4j.getWorkspaceManager().getDebugMode());
 
@@ -77,9 +76,8 @@ public class DebugModeTests extends BaseNd4jTestWithBackends {
         assertEquals(DebugMode.SPILL_EVERYTHING, Nd4j.getWorkspaceManager().getDebugMode());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSpillMode_1(Nd4jBackend backend) {
         Nd4j.getWorkspaceManager().setDebugMode(DebugMode.SPILL_EVERYTHING);
 
@@ -105,9 +103,8 @@ public class DebugModeTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSpillMode_2(Nd4jBackend backend) {
         Nd4j.getWorkspaceManager().setDebugMode(DebugMode.SPILL_EVERYTHING);
 
@@ -141,9 +138,8 @@ public class DebugModeTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBypassMode_1(Nd4jBackend backend) {
         Nd4j.getWorkspaceManager().setDebugMode(DebugMode.BYPASS_EVERYTHING);
 
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/EndlessWorkspaceTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/EndlessWorkspaceTests.java
index c65c28e43..2cbea5cc9 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/EndlessWorkspaceTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/EndlessWorkspaceTests.java
@@ -72,9 +72,8 @@ public class EndlessWorkspaceTests extends BaseNd4jTestWithBackends {
      *
      * @throws Exception
      */
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void endlessTest1(Nd4jBackend backend) {
 
         Nd4j.getWorkspaceManager().setDefaultWorkspaceConfiguration(
@@ -101,9 +100,8 @@ public class EndlessWorkspaceTests extends BaseNd4jTestWithBackends {
      * This test checks for allocation from workspace AND spills
      * @throws Exception
      */
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void endlessTest2(Nd4jBackend backend) {
         Nd4j.getWorkspaceManager().setDefaultWorkspaceConfiguration(
                         WorkspaceConfiguration.builder().initialSize(10 * 1024L * 1024L).build());
@@ -137,9 +135,8 @@ public class EndlessWorkspaceTests extends BaseNd4jTestWithBackends {
      *
      * @throws Exception
      */
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void endlessTest3(Nd4jBackend backend) {
         Nd4j.getWorkspaceManager().setDefaultWorkspaceConfiguration(
                         WorkspaceConfiguration.builder().initialSize(10 * 1024L * 1024L).build());
@@ -168,9 +165,8 @@ public class EndlessWorkspaceTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void endlessTest4(Nd4jBackend backend) {
         Nd4j.getWorkspaceManager().setDefaultWorkspaceConfiguration(
                         WorkspaceConfiguration.builder().initialSize(100 * 1024L * 1024L).build());
@@ -191,9 +187,8 @@ public class EndlessWorkspaceTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void endlessTest5(Nd4jBackend backend) throws Exception {
         while (true) {
             Thread thread = new Thread(new Runnable() {
@@ -215,9 +210,8 @@ public class EndlessWorkspaceTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void endlessTest6(Nd4jBackend backend) {
         Nd4j.getMemoryManager().togglePeriodicGc(false);
         WorkspaceConfiguration wsConf = WorkspaceConfiguration.builder().initialSize(10 * 1024L * 1024L)
@@ -234,9 +228,8 @@ public class EndlessWorkspaceTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
 
     public void endlessValidation1(Nd4jBackend backend) {
         Nd4j.getMemoryManager().togglePeriodicGc(true);
@@ -256,9 +249,8 @@ public class EndlessWorkspaceTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPerf1(Nd4jBackend backend) {
         Nd4j.getWorkspaceManager()
                         .setDefaultWorkspaceConfiguration(WorkspaceConfiguration.builder().initialSize(50000L).build());
@@ -299,9 +291,8 @@ public class EndlessWorkspaceTests extends BaseNd4jTestWithBackends {
         log.info("Block: {} ns; Op: {} ns;", results.get(pos), resultsOp.get(pos));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void endlessTestSerDe1(Nd4jBackend backend) throws Exception {
         INDArray features = Nd4j.create(32, 3, 224, 224);
         INDArray labels = Nd4j.create(32, 200);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/SpecialWorkspaceTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/SpecialWorkspaceTests.java
index 1df9d4af7..61840e0d0 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/SpecialWorkspaceTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/SpecialWorkspaceTests.java
@@ -60,9 +60,8 @@ public class SpecialWorkspaceTests extends BaseNd4jTestWithBackends {
         Nd4j.setDataType(this.initialType);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVariableTimeSeries1(Nd4jBackend backend) {
         WorkspaceConfiguration configuration = WorkspaceConfiguration
                 .builder()
@@ -169,9 +168,8 @@ public class SpecialWorkspaceTests extends BaseNd4jTestWithBackends {
         Nd4j.getWorkspaceManager().printAllocationStatisticsForCurrentThread();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVariableTimeSeries2(Nd4jBackend backend) {
         WorkspaceConfiguration configuration = WorkspaceConfiguration.builder().initialSize(0).overallocationLimit(3.0)
                 .policyAllocation(AllocationPolicy.OVERALLOCATE).policySpill(SpillPolicy.REALLOCATE)
@@ -212,9 +210,8 @@ public class SpecialWorkspaceTests extends BaseNd4jTestWithBackends {
         assertEquals(0, workspace.getPinnedSize());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testViewDetach_1(Nd4jBackend backend) {
         WorkspaceConfiguration configuration = WorkspaceConfiguration.builder().initialSize(10000000).overallocationLimit(3.0)
                 .policyAllocation(AllocationPolicy.OVERALLOCATE).policySpill(SpillPolicy.REALLOCATE)
@@ -243,9 +240,8 @@ public class SpecialWorkspaceTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAlignment_1(Nd4jBackend backend) {
         WorkspaceConfiguration initialConfig = WorkspaceConfiguration.builder().initialSize(10 * 1024L * 1024L)
                 .policyAllocation(AllocationPolicy.STRICT).policyLearning(LearningPolicy.NONE).build();
@@ -266,9 +262,8 @@ public class SpecialWorkspaceTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNoOpExecution_1(Nd4jBackend backend) {
         val configuration = WorkspaceConfiguration.builder().initialSize(10000000).overallocationLimit(3.0)
                 .policyAllocation(AllocationPolicy.OVERALLOCATE).policySpill(SpillPolicy.REALLOCATE)
@@ -305,9 +300,8 @@ public class SpecialWorkspaceTests extends BaseNd4jTestWithBackends {
         log.info("{} ns", ((timeEnd - timeStart) / (double) iterations));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWorkspaceOrder_1(){
         WorkspaceConfiguration conf = WorkspaceConfiguration.builder()
                 .initialSize(1_000_000)
@@ -342,9 +336,8 @@ public class SpecialWorkspaceTests extends BaseNd4jTestWithBackends {
         assertEquals(exp, res);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmapedWorkspaceLimits_1() throws Exception {
         if (!Nd4j.getEnvironment().isCPU())
             return;
@@ -368,9 +361,8 @@ public class SpecialWorkspaceTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMmapedWorkspace_Path_Limits_1() throws Exception {
         if (!Nd4j.getEnvironment().isCPU())
             return;
@@ -394,9 +386,8 @@ public class SpecialWorkspaceTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDeleteMappedFile_1() throws Exception {
         if (!Nd4j.getEnvironment().isCPU())
             return;
@@ -442,9 +433,8 @@ public class SpecialWorkspaceTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMigrateToWorkspace(){
         val src = Nd4j.createFromArray (1L,2L);
         val wsConf = new WorkspaceConfiguration().builder().build();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/WorkspaceProviderTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/WorkspaceProviderTests.java
index 595e60b2b..0145589e3 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/WorkspaceProviderTests.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/WorkspaceProviderTests.java
@@ -123,9 +123,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
      *
      * @throws Exception
      */
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUnboundedLoop2(Nd4jBackend backend) {
         WorkspaceConfiguration configuration =
                 WorkspaceConfiguration.builder().initialSize(0).policyReset(ResetPolicy.ENDOFBUFFER_REACHED)
@@ -160,9 +159,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
         assertNull(Nd4j.getMemoryManager().getCurrentWorkspace());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testUnboundedLoop1(Nd4jBackend backend) {
         WorkspaceConfiguration configuration = WorkspaceConfiguration.builder()
                 .initialSize(100 * 100 * Nd4j.sizeOfDataType()).policyReset(ResetPolicy.ENDOFBUFFER_REACHED)
@@ -196,9 +194,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
         assertNull(Nd4j.getMemoryManager().getCurrentWorkspace());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMultithreading1() throws Exception {
         final List<MemoryWorkspace> workspaces = new CopyOnWriteArrayList<>();
         Nd4j.getWorkspaceManager().setDefaultWorkspaceConfiguration(basicConfiguration);
@@ -230,9 +227,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNestedWorkspacesOverlap2(Nd4jBackend backend) {
         Nd4j.getWorkspaceManager().setDefaultWorkspaceConfiguration(basicConfiguration);
 
@@ -281,9 +277,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
         assertNull(Nd4j.getMemoryManager().getCurrentWorkspace());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNestedWorkspacesOverlap1(Nd4jBackend backend) {
         Nd4j.setDefaultDataTypes(DataType.FLOAT, DataType.FLOAT);
         Nd4j.getWorkspaceManager().setDefaultWorkspaceConfiguration(basicConfiguration);
@@ -315,9 +310,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
         assertNull(Nd4j.getMemoryManager().getCurrentWorkspace());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWorkspacesSerde3() throws Exception {
         INDArray array = Nd4j.create(10).assign(1.0);
         INDArray restored = null;
@@ -349,9 +343,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWorkspacesSerde2() throws Exception {
         INDArray array = Nd4j.create(10).assign(1.0);
         INDArray restored = null;
@@ -379,9 +372,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWorkspacesSerde1() throws Exception {
         int[] shape = new int[] {17, 57, 79};
         INDArray array = Nd4j.create(shape).assign(1.0);
@@ -405,9 +397,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCircularBufferReset1(Nd4jBackend backend) {
         Nd4jWorkspace workspace = (Nd4jWorkspace) Nd4j.getWorkspaceManager()
                 .getWorkspaceForCurrentThread(circularConfiguration, "WSR_1");
@@ -439,9 +430,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVariableInput1(Nd4jBackend backend) {
         Nd4jWorkspace workspace = (Nd4jWorkspace) Nd4j.getWorkspaceManager()
                 .getWorkspaceForCurrentThread(adsiConfiguration, "ADSI");
@@ -529,9 +519,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReallocate3(Nd4jBackend backend) {
         MemoryWorkspace workspace = Nd4j.getWorkspaceManager()
                 .getWorkspaceForCurrentThread(reallocateUnspecifiedConfiguration, "WS_1");
@@ -561,9 +550,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
         assertEquals(100 * 10 * Nd4j.sizeOfDataType(), workspace.getCurrentSize(),"Failed on final");
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReallocate2(Nd4jBackend backend) {
         MemoryWorkspace workspace =
                 Nd4j.getWorkspaceManager().getWorkspaceForCurrentThread(reallocateDelayedConfiguration, "WS_1");
@@ -581,9 +569,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCircularLearning1(Nd4jBackend backend) {
         INDArray array1;
         INDArray array2;
@@ -605,9 +592,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
 
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReallocate1(Nd4jBackend backend) {
         try (MemoryWorkspace ws = Nd4j.getWorkspaceManager().getAndActivateWorkspace(reallocateConfiguration, "WS_1")) {
             INDArray array = Nd4j.create(100);
@@ -661,9 +647,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNestedWorkspaces10(Nd4jBackend backend) {
         for (int x = 1; x < 10; x++) {
             try (MemoryWorkspace ws1 = Nd4j.getWorkspaceManager().getAndActivateWorkspace(basicConfiguration, "WS_1")) {
@@ -682,9 +667,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNestedWorkspaces9(Nd4jBackend backend) {
         for (int x = 1; x < 10; x++) {
             try (MemoryWorkspace ws =
@@ -701,9 +685,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNestedWorkspaces8(Nd4jBackend backend) {
         try (MemoryWorkspace ws = Nd4j.getWorkspaceManager().getAndActivateWorkspace(loopConfiguration, "WS_1")) {
             INDArray array = Nd4j.create(100);
@@ -726,9 +709,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
         assertEquals(100 * Nd4j.sizeOfDataType(), workspace.getCurrentSize());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNestedWorkspaces7(Nd4jBackend backend) {
         try (Nd4jWorkspace wsExternal = (Nd4jWorkspace) Nd4j.getWorkspaceManager()
                 .getAndActivateWorkspace(basicConfiguration, "External")) {
@@ -768,9 +750,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNestedWorkspaces6(Nd4jBackend backend) {
 
         try (Nd4jWorkspace wsExternal = (Nd4jWorkspace) Nd4j.getWorkspaceManager()
@@ -808,9 +789,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNestedWorkspaces5(Nd4jBackend backend) {
         Nd4j.getWorkspaceManager().setDefaultWorkspaceConfiguration(basicConfiguration);
         try (Nd4jWorkspace ws1 = (Nd4jWorkspace) Nd4j.getWorkspaceManager().getWorkspaceForCurrentThread("WS1")
@@ -835,9 +815,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
         assertNull(Nd4j.getMemoryManager().getCurrentWorkspace());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNestedWorkspaces4(Nd4jBackend backend) {
         Nd4j.getWorkspaceManager().setDefaultWorkspaceConfiguration(basicConfiguration);
 
@@ -881,9 +860,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
         assertNull(Nd4j.getMemoryManager().getCurrentWorkspace());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNestedWorkspaces3(Nd4jBackend backend) {
         Nd4j.getWorkspaceManager().setDefaultWorkspaceConfiguration(basicConfiguration);
 
@@ -929,9 +907,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
         assertNull(Nd4j.getMemoryManager().getCurrentWorkspace());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNestedWorkspaces2(Nd4jBackend backend) {
         Nd4j.getWorkspaceManager().setDefaultWorkspaceConfiguration(basicConfiguration);
 
@@ -960,9 +937,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
         assertNull(Nd4j.getMemoryManager().getCurrentWorkspace());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNestedWorkspaces1(Nd4jBackend backend) {
         Nd4j.getWorkspaceManager().setDefaultWorkspaceConfiguration(basicConfiguration);
 
@@ -990,9 +966,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
         Nd4j.getWorkspaceManager().destroyAllWorkspacesForCurrentThread();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNewWorkspace1(Nd4jBackend backend) {
         MemoryWorkspace workspace1 = Nd4j.getWorkspaceManager().getWorkspaceForCurrentThread();
 
@@ -1003,9 +978,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
         assertEquals(workspace1, workspace2);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWorkspaceGc_1() throws Exception {
 
         for (int e = 0; e < 10; e++) {
@@ -1033,9 +1007,8 @@ public class WorkspaceProviderTests extends BaseNd4jTestWithBackends {
     }
 
     @Disabled
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMemcpy1(Nd4jBackend backend) {
         INDArray warmUp = Nd4j.create(100000);
         for (int x = 0; x < 5000; x++) {
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/list/NDArrayListTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/list/NDArrayListTest.java
index f892ec843..2d4d93a7f 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/list/NDArrayListTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/list/NDArrayListTest.java
@@ -39,9 +39,8 @@ public class NDArrayListTest extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testList(Nd4jBackend backend) {
         NDArrayList ndArrayList = new NDArrayList();
         List<Double> arrayAssertion = new ArrayList<>();
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/serde/base64/Nd4jBase64Test.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/serde/base64/Nd4jBase64Test.java
index 2fe1a3a24..1b13efed9 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/serde/base64/Nd4jBase64Test.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/serde/base64/Nd4jBase64Test.java
@@ -38,9 +38,8 @@ public class Nd4jBase64Test extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBase64(Nd4jBackend backend) throws Exception {
         INDArray arr = Nd4j.linspace(1, 4, 4);
         String base64 = Nd4jBase64.base64String(arr);
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/serde/binary/BinarySerdeTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/serde/binary/BinarySerdeTest.java
index bb8fd4ffa..bc463cadc 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/serde/binary/BinarySerdeTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/serde/binary/BinarySerdeTest.java
@@ -48,9 +48,8 @@ public class BinarySerdeTest extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToAndFrom(Nd4jBackend backend) {
         INDArray arr = Nd4j.scalar(1.0);
         ByteBuffer buffer = BinarySerde.toByteBuffer(arr);
@@ -58,9 +57,8 @@ public class BinarySerdeTest extends BaseNd4jTestWithBackends {
         assertEquals(arr, back);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToAndFromHeapBuffer(Nd4jBackend backend) {
         INDArray arr = Nd4j.scalar(1.0);
         ByteBuffer buffer = BinarySerde.toByteBuffer(arr);
@@ -70,9 +68,8 @@ public class BinarySerdeTest extends BaseNd4jTestWithBackends {
         assertEquals(arr, back);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToAndFromCompressed(Nd4jBackend backend) {
         OpValidationSuite.ignoreFailing();  //Failing 2019/01/24
         INDArray arr = Nd4j.scalar(1.0);
@@ -86,9 +83,8 @@ public class BinarySerdeTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testToAndFromCompressedLarge(Nd4jBackend backend) {
         OpValidationSuite.ignoreFailing();  //Failing 2019/01/24
         INDArray arr = Nd4j.zeros((int) 1e7);
@@ -102,9 +98,8 @@ public class BinarySerdeTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReadWriteFile(Nd4jBackend backend) throws Exception {
         File tmpFile = new File(System.getProperty("java.io.tmpdir"),
                         "ndarraytmp-" + UUID.randomUUID().toString() + " .bin");
@@ -115,9 +110,8 @@ public class BinarySerdeTest extends BaseNd4jTestWithBackends {
         assertEquals(rand, fromDisk);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReadShapeFile(Nd4jBackend backend) throws Exception {
         File tmpFile = new File(System.getProperty("java.io.tmpdir"),
                         "ndarraytmp-" + UUID.randomUUID().toString() + " .bin");
@@ -129,9 +123,8 @@ public class BinarySerdeTest extends BaseNd4jTestWithBackends {
         assertArrayEquals(rand.shapeInfoDataBuffer().asLong(), buffer.asLong());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void timeOldVsNew(Nd4jBackend backend) throws Exception {
         int numTrials = 1000;
         long oldTotal = 0;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/smoketests/SmokeTest.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/smoketests/SmokeTest.java
index 89029ec9d..c29d942f3 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/smoketests/SmokeTest.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/smoketests/SmokeTest.java
@@ -36,9 +36,8 @@ import org.nd4j.linalg.profiler.ProfilerConfig;
 public class SmokeTest {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBasic() {
         Nd4j.getEnvironment().setDebug(true);
         Nd4j.getExecutioner().setProfilingConfig(ProfilerConfig.builder()
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/systeminfo/TestSystemInfo.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/systeminfo/TestSystemInfo.java
index 8538a4391..976f17517 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/systeminfo/TestSystemInfo.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/systeminfo/TestSystemInfo.java
@@ -26,9 +26,8 @@ import org.junit.jupiter.params.provider.MethodSource;
 import org.nd4j.common.tests.BaseND4JTest;
 
 public class TestSystemInfo extends BaseND4JTest {
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSystemInfo(){
         SystemInfo.printSystemInfo();
     }
diff --git a/nd4j/nd4j-common-tests/src/main/java/org/nd4j/linalg/BaseNd4jTestWithBackends.java b/nd4j/nd4j-common-tests/src/main/java/org/nd4j/linalg/BaseNd4jTestWithBackends.java
index c5a30ed12..1758ac8ec 100644
--- a/nd4j/nd4j-common-tests/src/main/java/org/nd4j/linalg/BaseNd4jTestWithBackends.java
+++ b/nd4j/nd4j-common-tests/src/main/java/org/nd4j/linalg/BaseNd4jTestWithBackends.java
@@ -60,7 +60,8 @@ public abstract class BaseNd4jTestWithBackends extends BaseND4JTest {
 
 
     public static Stream<Arguments> configs() {
-        return BACKENDS.stream().map(input -> Arguments.of(input));
+        Stream<Arguments> ret =  BACKENDS.stream().map(input -> Arguments.of(input));
+        return ret;
     }
 
     @BeforeEach
diff --git a/nd4j/nd4j-common/src/test/java/org/nd4j/common/loader/TestFileBatch.java b/nd4j/nd4j-common/src/test/java/org/nd4j/common/loader/TestFileBatch.java
index e3878d8fd..2f47eb2a3 100644
--- a/nd4j/nd4j-common/src/test/java/org/nd4j/common/loader/TestFileBatch.java
+++ b/nd4j/nd4j-common/src/test/java/org/nd4j/common/loader/TestFileBatch.java
@@ -59,7 +59,7 @@ public class TestFileBatch {
 
         assertEquals(10, fb.getFileBytes().size());
         assertEquals(10, fb.getOriginalUris().size());
-        for( int i=0; i<10; i++ ){
+        for( int i = 0; i < 10; i++) {
             byte[] expBytes = ("File contents - file " + i).getBytes(StandardCharsets.UTF_8);
             byte[] actBytes = fb.getFileBytes().get(i);
             assertArrayEquals(expBytes, actBytes);
@@ -87,7 +87,6 @@ public class TestFileBatch {
 
         //Check that it is indeed a valid zip file:
         File f = Files.createTempFile(testDir,"testfile","zip").toFile();
-        f.delete();
         fb.writeAsZip(f);
 
         ZipFile zf = new ZipFile(f);
@@ -99,9 +98,10 @@ public class TestFileBatch {
             names.add(entry.getName());
         }
 
+        zf.close();
         assertEquals(11, names.size()); //10 files, 1 "original file names" file
         assertTrue(names.contains(FileBatch.ORIGINAL_PATHS_FILENAME));
-        for( int i=0; i<10; i++ ){
+        for( int i = 0; i < 10; i++) {
             String n = "file_" + i + ".txt";
             assertTrue(names.contains(n),n);
         }
diff --git a/nd4j/nd4j-onnxruntime/src/test/java/org/nd4j/onnxruntime/runner/OnnxRuntimeRunnerTests.java b/nd4j/nd4j-onnxruntime/src/test/java/org/nd4j/onnxruntime/runner/OnnxRuntimeRunnerTests.java
index 1cb1859d3..9625a5f7f 100644
--- a/nd4j/nd4j-onnxruntime/src/test/java/org/nd4j/onnxruntime/runner/OnnxRuntimeRunnerTests.java
+++ b/nd4j/nd4j-onnxruntime/src/test/java/org/nd4j/onnxruntime/runner/OnnxRuntimeRunnerTests.java
@@ -19,6 +19,7 @@
  */
 package org.nd4j.onnxruntime.runner;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.nd4j.common.io.ClassPathResource;
 import org.nd4j.linalg.api.ndarray.INDArray;
@@ -36,6 +37,7 @@ public class OnnxRuntimeRunnerTests {
 
 
     @Test
+    @Disabled
     public void testAdd() throws Exception {
         ClassPathResource classPathResource = new ClassPathResource("add.onnx");
         File f = classPathResource.getFile();
diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/background/RemoteParameterServerClientTests.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/background/RemoteParameterServerClientTests.java
index 2829a0709..456e39aa5 100644
--- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/background/RemoteParameterServerClientTests.java
+++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/background/RemoteParameterServerClientTests.java
@@ -38,6 +38,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @Slf4j
+@Disabled
 public class RemoteParameterServerClientTests extends BaseND4JTest {
     private int parameterLength = 1000;
     private Aeron.Context ctx;
diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/client/ParameterServerClientPartialTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/client/ParameterServerClientPartialTest.java
index ded84b68e..ccc393960 100644
--- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/client/ParameterServerClientPartialTest.java
+++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/client/ParameterServerClientPartialTest.java
@@ -25,7 +25,6 @@ import io.aeron.driver.MediaDriver;
 import io.aeron.driver.ThreadingMode;
 import lombok.extern.slf4j.Slf4j;
 import org.agrona.concurrent.BusySpinIdleStrategy;
-import org.junit.BeforeClass;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -38,11 +37,10 @@ import org.nd4j.linalg.factory.Nd4j;
 import org.nd4j.parameterserver.ParameterServerListener;
 import org.nd4j.parameterserver.ParameterServerSubscriber;
 
-import static junit.framework.TestCase.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 @Slf4j
+@Disabled
 public class ParameterServerClientPartialTest extends BaseND4JTest {
     private static MediaDriver mediaDriver;
     private static Aeron.Context ctx;
diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/client/ParameterServerClientTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/client/ParameterServerClientTest.java
index 8044be0a5..eea4cff83 100644
--- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/client/ParameterServerClientTest.java
+++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/src/test/java/org/nd4j/parameterserver/client/ParameterServerClientTest.java
@@ -22,7 +22,6 @@ package org.nd4j.parameterserver.client;
 
 import io.aeron.Aeron;
 import io.aeron.driver.MediaDriver;
-import org.junit.BeforeClass;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -36,10 +35,9 @@ import org.nd4j.parameterserver.ParameterServerSubscriber;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static junit.framework.TestCase.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
+@Disabled
 public class ParameterServerClientTest extends BaseND4JTest {
     private static MediaDriver mediaDriver;
     private static Logger log = LoggerFactory.getLogger(ParameterServerClientTest.class);
diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/node/ParameterServerNode.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/node/ParameterServerNode.java
index 3b65ee134..75b4861cc 100644
--- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/node/ParameterServerNode.java
+++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/main/java/org/nd4j/parameterserver/node/ParameterServerNode.java
@@ -32,7 +32,6 @@ import org.nd4j.parameterserver.ParameterServerListener;
 import org.nd4j.parameterserver.ParameterServerSubscriber;
 import org.nd4j.parameterserver.status.play.InMemoryStatusStorage;
 import org.nd4j.parameterserver.status.play.StatusServer;
-import play.server.Server;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -42,7 +41,6 @@ import java.util.List;
 @NoArgsConstructor
 @Data
 public class ParameterServerNode implements AutoCloseable {
-    private Server server;
     private ParameterServerSubscriber[] subscriber;
     private MediaDriver mediaDriver;
     private Aeron aeron;
@@ -91,7 +89,6 @@ public class ParameterServerNode implements AutoCloseable {
      * @param args the arguments for the {@link ParameterServerSubscriber}
      */
     public void runMain(String[] args) {
-        server = StatusServer.startServer(new InMemoryStatusStorage(), statusPort);
         if (mediaDriver == null)
             mediaDriver = MediaDriver.launchEmbedded();
         log.info("Started media driver with aeron directory " + mediaDriver.aeronDirectoryName());
@@ -169,8 +166,7 @@ public class ParameterServerNode implements AutoCloseable {
                 }
             }
         }
-        if (server != null)
-            server.stop();
+
         if (mediaDriver != null)
             CloseHelper.quietClose(mediaDriver);
         if (aeron != null)
diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/node/ParameterServerNodeTest.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/node/ParameterServerNodeTest.java
deleted file mode 100644
index b16e10d31..000000000
--- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/src/test/java/org/nd4j/parameterserver/node/ParameterServerNodeTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- *  ******************************************************************************
- *  *
- *  *
- *  * This program and the accompanying materials are made available under the
- *  * terms of the Apache License, Version 2.0 which is available at
- *  * https://www.apache.org/licenses/LICENSE-2.0.
- *  *
- *  *  See the NOTICE file distributed with this work for additional
- *  *  information regarding copyright ownership.
- *  * Unless required by applicable law or agreed to in writing, software
- *  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  * License for the specific language governing permissions and limitations
- *  * under the License.
- *  *
- *  * SPDX-License-Identifier: Apache-2.0
- *  *****************************************************************************
- */
-
-package org.nd4j.parameterserver.node;
-
-import io.aeron.Aeron;
-import io.aeron.driver.MediaDriver;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.BeforeClass;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.nd4j.common.tests.BaseND4JTest;
-import org.nd4j.aeron.ipc.AeronUtil;
-import org.nd4j.aeron.ipc.NDArrayMessage;
-import org.nd4j.linalg.factory.Nd4j;
-import org.nd4j.parameterserver.client.ParameterServerClient;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-@Slf4j
-@Disabled
-@Deprecated
-public class ParameterServerNodeTest extends BaseND4JTest {
-    private static MediaDriver mediaDriver;
-    private static Aeron aeron;
-    private static ParameterServerNode parameterServerNode;
-    private static int parameterLength = 4;
-    private static int masterStatusPort = 40323 + new java.util.Random().nextInt(15999);
-    private static int statusPort = masterStatusPort - 1299;
-
-    @BeforeAll
-    public static void before() throws Exception {
-        mediaDriver = MediaDriver.launchEmbedded(AeronUtil.getMediaDriverContext(parameterLength));
-        System.setProperty("play.server.dir", "/tmp");
-        aeron = Aeron.connect(getContext());
-        parameterServerNode = new ParameterServerNode(mediaDriver, statusPort);
-        parameterServerNode.runMain(new String[] {"-m", "true", "-s", "1," + String.valueOf(parameterLength), "-p",
-                String.valueOf(masterStatusPort), "-h", "localhost", "-id", "11", "-md",
-                mediaDriver.aeronDirectoryName(), "-sp", String.valueOf(statusPort), "-sh", "localhost", "-u",
-                String.valueOf(Runtime.getRuntime().availableProcessors())});
-
-        while (!parameterServerNode.subscriberLaunched()) {
-            Thread.sleep(10000);
-        }
-
-    }
-
-    @Test
-    public void testSimulateRun() throws Exception {
-        int numCores = Runtime.getRuntime().availableProcessors();
-        ExecutorService executorService = Executors.newFixedThreadPool(numCores);
-        ParameterServerClient[] clients = new ParameterServerClient[numCores];
-        String host = "localhost";
-        for (int i = 0; i < numCores; i++) {
-            clients[i] = ParameterServerClient.builder().aeron(aeron).masterStatusHost(host)
-                    .masterStatusPort(statusPort).subscriberHost(host).subscriberPort(40325 + i)
-                    .subscriberStream(10 + i)
-                    .ndarrayRetrieveUrl(parameterServerNode.getSubscriber()[i].getResponder().connectionUrl())
-                    .ndarraySendUrl(parameterServerNode.getSubscriber()[i].getSubscriber().connectionUrl())
-                    .build();
-        }
-
-        Thread.sleep(60000);
-
-        //no arrays have been sent yet
-        for (int i = 0; i < numCores; i++) {
-            assertFalse(clients[i].isReadyForNext());
-        }
-
-        //send "numCores" arrays, the default parameter server updater
-        //is synchronous so it should be "ready" when number of updates == number of workers
-        for (int i = 0; i < numCores; i++) {
-            clients[i].pushNDArrayMessage(NDArrayMessage.wholeArrayUpdate(Nd4j.ones(parameterLength)));
-        }
-
-        Thread.sleep(10000);
-
-        //all arrays should have been sent
-        for (int i = 0; i < numCores; i++) {
-            assertTrue(clients[i].isReadyForNext());
-        }
-
-        Thread.sleep(10000);
-
-        for (int i = 0; i < 1; i++) {
-            assertEquals(Nd4j.valueArrayOf(1, parameterLength, numCores), clients[i].getArray());
-            Thread.sleep(1000);
-        }
-
-        executorService.shutdown();
-
-        Thread.sleep(60000);
-
-        parameterServerNode.close();
-
-
-    }
-
-
-    private static Aeron.Context getContext() {
-        return new Aeron.Context().driverTimeoutMs(10000)
-                .availableImageHandler(AeronUtil::printAvailableImage)
-                .unavailableImageHandler(AeronUtil::printUnavailableImage)
-                .aeronDirectoryName(mediaDriver.aeronDirectoryName()).keepAliveIntervalNs(100000)
-                .errorHandler(e -> log.error(e.toString(), e));
-    }
-
-
-}
diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-rocksdb-storage/src/test/java/org/nd4j/parameterserver/updater/storage/UpdaterStorageTests.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-rocksdb-storage/src/test/java/org/nd4j/parameterserver/updater/storage/UpdaterStorageTests.java
index 4e3c688d8..7bec711f9 100644
--- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-rocksdb-storage/src/test/java/org/nd4j/parameterserver/updater/storage/UpdaterStorageTests.java
+++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-rocksdb-storage/src/test/java/org/nd4j/parameterserver/updater/storage/UpdaterStorageTests.java
@@ -20,14 +20,17 @@
 
 package org.nd4j.parameterserver.updater.storage;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.nd4j.common.tests.BaseND4JTest;
 import org.nd4j.aeron.ipc.NDArrayMessage;
 import org.nd4j.linalg.factory.Nd4j;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+
+@Disabled
 public class UpdaterStorageTests extends BaseND4JTest {
 
     @Test()
diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/pom.xml b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/pom.xml
deleted file mode 100644
index d29df2bde..000000000
--- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/pom.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ /* ******************************************************************************
-  ~  *
-  ~  *
-  ~  * This program and the accompanying materials are made available under the
-  ~  * terms of the Apache License, Version 2.0 which is available at
-  ~  * https://www.apache.org/licenses/LICENSE-2.0.
-  ~  *
-  ~  *  See the NOTICE file distributed with this work for additional
-  ~  *  information regarding copyright ownership.
-  ~  * Unless required by applicable law or agreed to in writing, software
-  ~  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  ~  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  ~  * License for the specific language governing permissions and limitations
-  ~  * under the License.
-  ~  *
-  ~  * SPDX-License-Identifier: Apache-2.0
-  ~  ******************************************************************************/
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.nd4j</groupId>
-        <artifactId>nd4j-parameter-server-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>nd4j-parameter-server-status_2.11</artifactId>
-
-    <name>nd4j-parameter-server-status</name>
-
-    <properties>
-        <!-- Default scala versions, may be overwritten by build profiles -->
-        <scala.version>2.11.12</scala.version>
-        <scala.binary.version>2.11</scala.binary.version>
-    </properties>
-
-    <dependencies>
-        <!-- MapDB - Used for StatsListener storage -->
-        <dependency>
-            <groupId>org.mapdb</groupId>
-            <artifactId>mapdb</artifactId>
-            <version>${mapdb.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.nd4j</groupId>
-            <artifactId>nd4j-parameter-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.typesafe.play</groupId>
-            <artifactId>play-netty-server_2.11</artifactId>
-            <version>${playframework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.typesafe.play</groupId>
-            <artifactId>play-java_2.11</artifactId>
-            <version>${playframework.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>ch.qos.logback</groupId>
-                    <artifactId>logback-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>ch.qos.logback</groupId>
-                    <artifactId>logback-classic</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.google.code.findbugs</groupId>
-                    <artifactId>jsr305</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>jul-to-slf4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>jcl-over-slf4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.tomcat</groupId>
-                    <artifactId>tomcat-servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>net.jodah</groupId>
-                    <artifactId>typetools</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.nd4j</groupId>
-            <artifactId>nd4j-common-tests</artifactId>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>testresources</id>
-        </profile>
-    </profiles>
-</project>
diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/main/java/org/nd4j/parameterserver/status/play/BaseStatusStorage.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/main/java/org/nd4j/parameterserver/status/play/BaseStatusStorage.java
deleted file mode 100644
index 6eef3cd86..000000000
--- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/main/java/org/nd4j/parameterserver/status/play/BaseStatusStorage.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- *  ******************************************************************************
- *  *
- *  *
- *  * This program and the accompanying materials are made available under the
- *  * terms of the Apache License, Version 2.0 which is available at
- *  * https://www.apache.org/licenses/LICENSE-2.0.
- *  *
- *  *  See the NOTICE file distributed with this work for additional
- *  *  information regarding copyright ownership.
- *  * Unless required by applicable law or agreed to in writing, software
- *  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  * License for the specific language governing permissions and limitations
- *  * under the License.
- *  *
- *  * SPDX-License-Identifier: Apache-2.0
- *  *****************************************************************************
- */
-
-package org.nd4j.parameterserver.status.play;
-
-import io.aeron.driver.MediaDriver;
-import lombok.extern.slf4j.Slf4j;
-import org.nd4j.parameterserver.ParameterServerSubscriber;
-import org.nd4j.parameterserver.model.SubscriberState;
-
-import java.util.*;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-@Slf4j
-public abstract class BaseStatusStorage implements StatusStorage {
-    protected Map<Integer, SubscriberState> statusStorageMap = createMap();
-    private ScheduledExecutorService executorService;
-    protected Map<Integer, Long> updated;
-    private long heartBeatEjectionMilliSeconds = 1000;
-    private long checkInterval = 1000;
-
-    public BaseStatusStorage() {
-        this(1000, 1000);
-    }
-
-    /**
-     * The list of state ids
-     * for the given {@link SubscriberState}
-     *
-     * @return the list of ids for the given state
-     */
-    @Override
-    public List<Integer> ids() {
-        return new ArrayList<>(statusStorageMap.keySet());
-    }
-
-    /**
-     * Returns the number of states
-     * held by this storage
-     *
-     * @return
-     */
-    @Override
-    public int numStates() {
-        return statusStorageMap.size();
-    }
-
-    /**
-     *
-     * @param heartBeatEjectionMilliSeconds the amount of time before
-     *                                      ejecting a given subscriber as failed
-     * @param checkInterval the interval to check for
-     */
-    public BaseStatusStorage(long heartBeatEjectionMilliSeconds, long checkInterval) {
-        this.heartBeatEjectionMilliSeconds = heartBeatEjectionMilliSeconds;
-        this.checkInterval = checkInterval;
-        init();
-    }
-
-
-    private void init() {
-        updated = createUpdatedMap();
-        executorService = Executors.newScheduledThreadPool(1);
-        //eject values that haven't checked in a while
-        executorService.scheduleAtFixedRate(new Runnable() {
-            @Override
-            public void run() {
-                long curr = System.currentTimeMillis();
-                Set<Integer> remove = new HashSet<>();
-                for (Map.Entry<Integer, Long> entry : updated.entrySet()) {
-                    long val = entry.getValue();
-                    long diff = Math.abs(curr - val);
-                    if (diff > heartBeatEjectionMilliSeconds) {
-                        remove.add(entry.getKey());
-                    }
-                }
-
-                if (!remove.isEmpty())
-                    log.info("Removing " + remove.size() + " entries");
-                //purge removed values
-                for (Integer i : remove) {
-                    updated.remove(i);
-                    statusStorageMap.remove(i);
-                }
-
-            }
-        }, 30000, checkInterval, TimeUnit.MILLISECONDS);
-    }
-
-
-    /**
-     * Create the storage map
-     * @return
-     */
-    public abstract Map<Integer, Long> createUpdatedMap();
-
-    /**
-     * Create the storage map
-     * @return
-     */
-    public abstract Map<Integer, SubscriberState> createMap();
-
-    /**
-     * Get the state given an id.
-     * The integer represents a stream id
-     * for a given {@link ParameterServerSubscriber}.
-     * <p>
-     * A {@link SubscriberState} is supposed to be 1 to 1 mapping
-     * for a stream and a {@link MediaDriver}.
-     *
-     * @param id the id of the state to get
-     * @return the subscriber state for the given id or none
-     * if it doesn't exist
-     */
-    @Override
-    public SubscriberState getState(int id) {
-        if (!statusStorageMap.containsKey(id))
-            return SubscriberState.empty();
-        return statusStorageMap.get(id);
-    }
-
-    /**
-     * Update the state for storage
-     *
-     * @param subscriberState the subscriber state to update
-     */
-    @Override
-    public void updateState(SubscriberState subscriberState) {
-        updated.put(subscriberState.getStreamId(), System.currentTimeMillis());
-        statusStorageMap.put(subscriberState.getStreamId(), subscriberState);
-    }
-
-}
diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/main/java/org/nd4j/parameterserver/status/play/InMemoryStatusStorage.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/main/java/org/nd4j/parameterserver/status/play/InMemoryStatusStorage.java
deleted file mode 100644
index 87ec983e4..000000000
--- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/main/java/org/nd4j/parameterserver/status/play/InMemoryStatusStorage.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  ******************************************************************************
- *  *
- *  *
- *  * This program and the accompanying materials are made available under the
- *  * terms of the Apache License, Version 2.0 which is available at
- *  * https://www.apache.org/licenses/LICENSE-2.0.
- *  *
- *  *  See the NOTICE file distributed with this work for additional
- *  *  information regarding copyright ownership.
- *  * Unless required by applicable law or agreed to in writing, software
- *  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  * License for the specific language governing permissions and limitations
- *  * under the License.
- *  *
- *  * SPDX-License-Identifier: Apache-2.0
- *  *****************************************************************************
- */
-
-package org.nd4j.parameterserver.status.play;
-
-
-import org.nd4j.parameterserver.model.SubscriberState;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class InMemoryStatusStorage extends BaseStatusStorage {
-
-    /**
-     * Create the storage map
-     *
-     * @return
-     */
-    @Override
-    public Map<Integer, Long> createUpdatedMap() {
-        return new HashMap<>();
-    }
-
-    @Override
-    public Map<Integer, SubscriberState> createMap() {
-        return new HashMap<>();
-    }
-}
diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/main/java/org/nd4j/parameterserver/status/play/MapDbStatusStorage.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/main/java/org/nd4j/parameterserver/status/play/MapDbStatusStorage.java
deleted file mode 100644
index f8377f244..000000000
--- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/main/java/org/nd4j/parameterserver/status/play/MapDbStatusStorage.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- *  ******************************************************************************
- *  *
- *  *
- *  * This program and the accompanying materials are made available under the
- *  * terms of the Apache License, Version 2.0 which is available at
- *  * https://www.apache.org/licenses/LICENSE-2.0.
- *  *
- *  *  See the NOTICE file distributed with this work for additional
- *  *  information regarding copyright ownership.
- *  * Unless required by applicable law or agreed to in writing, software
- *  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  * License for the specific language governing permissions and limitations
- *  * under the License.
- *  *
- *  * SPDX-License-Identifier: Apache-2.0
- *  *****************************************************************************
- */
-
-package org.nd4j.parameterserver.status.play;
-
-import io.aeron.driver.MediaDriver;
-import lombok.NonNull;
-import org.mapdb.*;
-import org.nd4j.parameterserver.ParameterServerSubscriber;
-import org.nd4j.parameterserver.model.SubscriberState;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-
-/**
- * MapDB status storage
- *
- * @author Adam Gibson
- */
-public class MapDbStatusStorage extends BaseStatusStorage {
-    private DB db;
-    private File storageFile;
-
-    /**
-     * @param heartBeatEjectionMilliSeconds the amount of time before
-     *                                      ejecting a given subscriber as failed
-     * @param checkInterval                 the interval to check for
-     */
-    public MapDbStatusStorage(long heartBeatEjectionMilliSeconds, long checkInterval) {
-        super(heartBeatEjectionMilliSeconds, checkInterval);
-    }
-
-    public MapDbStatusStorage() {
-        this(1000, 1000);
-    }
-
-    /**
-     * Create the storage map
-     *
-     * @return
-     */
-    @Override
-    public Map<Integer, Long> createUpdatedMap() {
-        if (storageFile == null) {
-            //In-Memory Stats Storage
-            db = DBMaker.memoryDB().make();
-        } else {
-            db = DBMaker.fileDB(storageFile).closeOnJvmShutdown().transactionEnable() //Default to Write Ahead Log - lower performance, but has crash protection
-                            .make();
-        }
-
-        updated = db.hashMap("updated").keySerializer(Serializer.INTEGER).valueSerializer(Serializer.LONG)
-                        .createOrOpen();
-        return updated;
-    }
-
-
-
-    @Override
-    public Map<Integer, SubscriberState> createMap() {
-        if (storageFile == null) {
-            //In-Memory Stats Storage
-            db = DBMaker.memoryDB().make();
-        } else {
-            db = DBMaker.fileDB(storageFile).closeOnJvmShutdown().transactionEnable() //Default to Write Ahead Log - lower performance, but has crash protection
-                            .make();
-        }
-
-        statusStorageMap = db.hashMap("statusStorageMap").keySerializer(Serializer.INTEGER)
-                        .valueSerializer(new StatusStorageSerializer()).createOrOpen();
-        return statusStorageMap;
-    }
-
-    /**
-     * Get the state given an id.
-     * The integer represents a stream id
-     * for a given {@link ParameterServerSubscriber}.
-     * <p>
-     * A {@link SubscriberState} is supposed to be 1 to 1 mapping
-     * for a stream and a {@link MediaDriver}.
-     *
-     * @param id the id of the state to get
-     * @return the subscriber state for the given id or none
-     * if it doesn't exist
-     */
-    @Override
-    public SubscriberState getState(int id) {
-        if (!statusStorageMap.containsKey(id))
-            return SubscriberState.empty();
-        return statusStorageMap.get(id);
-    }
-
-
-
-    private class StatusStorageSerializer implements Serializer<SubscriberState> {
-
-        @Override
-        public void serialize(@NonNull DataOutput2 out, @NonNull SubscriberState value) throws IOException {
-            value.write(out);
-        }
-
-        @Override
-        public SubscriberState deserialize(@NonNull DataInput2 input, int available) throws IOException {
-            return SubscriberState.read(input);
-        }
-
-        @Override
-        public int compare(SubscriberState p1, SubscriberState p2) {
-            return p1.compareTo(p2);
-        }
-    }
-}
diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/main/java/org/nd4j/parameterserver/status/play/StatusServer.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/main/java/org/nd4j/parameterserver/status/play/StatusServer.java
deleted file mode 100644
index ef3806ffa..000000000
--- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/main/java/org/nd4j/parameterserver/status/play/StatusServer.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *  ******************************************************************************
- *  *
- *  *
- *  * This program and the accompanying materials are made available under the
- *  * terms of the Apache License, Version 2.0 which is available at
- *  * https://www.apache.org/licenses/LICENSE-2.0.
- *  *
- *  *  See the NOTICE file distributed with this work for additional
- *  *  information regarding copyright ownership.
- *  * Unless required by applicable law or agreed to in writing, software
- *  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  * License for the specific language governing permissions and limitations
- *  * under the License.
- *  *
- *  * SPDX-License-Identifier: Apache-2.0
- *  *****************************************************************************
- */
-
-package org.nd4j.parameterserver.status.play;
-
-
-import lombok.extern.slf4j.Slf4j;
-import org.nd4j.parameterserver.model.MasterStatus;
-import org.nd4j.parameterserver.model.ServerTypeJson;
-import org.nd4j.parameterserver.model.SlaveStatus;
-import org.nd4j.parameterserver.model.SubscriberState;
-import play.BuiltInComponents;
-import play.Mode;
-import play.libs.Json;
-import play.routing.Router;
-import play.routing.RoutingDsl;
-import play.server.Server;
-
-import static play.libs.Json.toJson;
-import static play.mvc.Results.ok;
-
-
-@Slf4j
-public class StatusServer {
-
-    /**
-     * Start a server based on the given subscriber.
-     * Note that for the port to start the server on, you should
-     * set the statusServerPortField on the subscriber
-     * either manually or via command line. The
-     * server defaults to port 9000.
-     *
-     * The end points are:
-     * /opType: returns the opType information (master/slave)
-     * /started: if it's a master node, it returns master:started/stopped and responder:started/stopped
-     * /connectioninfo: See the SlaveConnectionInfo and MasterConnectionInfo classes for fields.
-     * /ids: the list of ids for all of the subscribers
-     * @param statusStorage the subscriber to base
-     *                   the status server on
-     * @return the started server
-     */
-    public static Server startServer(StatusStorage statusStorage, int statusServerPort) {
-        log.info("Starting server on port " + statusServerPort);
-        return Server.forRouter(Mode.PROD, statusServerPort, builtInComponents -> createRouter(statusStorage, builtInComponents));
-    }
-
-    protected static Router createRouter(StatusStorage statusStorage, BuiltInComponents builtInComponents){
-        RoutingDsl dsl = RoutingDsl.fromComponents(builtInComponents);
-        dsl.GET("/ids/").routingTo(request -> ok(toJson(statusStorage.ids())));
-        dsl.GET("/state/:id").routingTo((request, id) -> ok(toJson(statusStorage.getState(Integer.parseInt(id.toString())))));
-        dsl.GET("/opType/:id").routingTo((request, id) -> ok(toJson(ServerTypeJson.builder()
-                .type(statusStorage.getState(Integer.parseInt(id.toString())).serverType()))));
-        dsl.GET("/started/:id").routingTo((request, id) -> {
-            boolean isMaster = statusStorage.getState(Integer.parseInt(id.toString())).isMaster();
-            if(isMaster){
-                return ok(toJson(MasterStatus.builder().master(statusStorage.getState(Integer.parseInt(id.toString())).getServerState())
-                        //note here that a responder is id + 1
-                        .responder(statusStorage.getState(Integer.parseInt(id.toString()) + 1).getServerState())
-                        .responderN(statusStorage.getState(Integer.parseInt(id.toString())).getTotalUpdates())
-                        .build()));
-            } else {
-                return ok(toJson(SlaveStatus.builder().slave(statusStorage.getState(Integer.parseInt(id.toString())).serverType()).build()));
-            }
-        });
-        dsl.GET("/connectioninfo/:id").routingTo((request, id) -> ok(toJson(statusStorage.getState(Integer.parseInt(id.toString())).getConnectionInfo())));
-
-        dsl.POST("/updatestatus/:id").routingTo((request, id) -> {
-            SubscriberState subscriberState = Json.fromJson(request.body().asJson(), SubscriberState.class);
-            statusStorage.updateState(subscriberState);
-            return ok(toJson(subscriberState));
-        });
-
-        return dsl.build();
-    }
-}
diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/main/java/org/nd4j/parameterserver/status/play/StatusStorage.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/main/java/org/nd4j/parameterserver/status/play/StatusStorage.java
deleted file mode 100644
index 7cecb1735..000000000
--- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/main/java/org/nd4j/parameterserver/status/play/StatusStorage.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  ******************************************************************************
- *  *
- *  *
- *  * This program and the accompanying materials are made available under the
- *  * terms of the Apache License, Version 2.0 which is available at
- *  * https://www.apache.org/licenses/LICENSE-2.0.
- *  *
- *  *  See the NOTICE file distributed with this work for additional
- *  *  information regarding copyright ownership.
- *  * Unless required by applicable law or agreed to in writing, software
- *  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  * License for the specific language governing permissions and limitations
- *  * under the License.
- *  *
- *  * SPDX-License-Identifier: Apache-2.0
- *  *****************************************************************************
- */
-
-package org.nd4j.parameterserver.status.play;
-
-import org.nd4j.parameterserver.model.SubscriberState;
-
-import java.util.List;
-
-public interface StatusStorage {
-
-    /**
-     * The list of state ids
-     * for the given {@link SubscriberState}
-     * @return the list of ids for the given state
-     */
-    List<Integer> ids();
-
-    /**
-     * Returns the number of states
-     * held by this storage
-     * @return
-     */
-    int numStates();
-
-    /**
-     * Get the state given an id.
-     * The integer represents a stream id
-     * for a given {@link org.nd4j.parameterserver.ParameterServerSubscriber}.
-     *
-     * A {@link SubscriberState} is supposed to be 1 to 1 mapping
-     * for a stream and a {@link io.aeron.driver.MediaDriver}.
-     * @param id the id of the state to get
-     * @return the subscriber state for the given id or none
-     * if it doesn't exist
-     */
-    SubscriberState getState(int id);
-
-    /**
-     * Update the state for storage
-     * @param subscriberState the subscriber state to update
-     */
-    void updateState(SubscriberState subscriberState);
-}
diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/test/java/org/nd4j/parameterserver/status/play/StatusServerTests.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/test/java/org/nd4j/parameterserver/status/play/StatusServerTests.java
deleted file mode 100644
index 4d65842c0..000000000
--- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/test/java/org/nd4j/parameterserver/status/play/StatusServerTests.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  ******************************************************************************
- *  *
- *  *
- *  * This program and the accompanying materials are made available under the
- *  * terms of the Apache License, Version 2.0 which is available at
- *  * https://www.apache.org/licenses/LICENSE-2.0.
- *  *
- *  *  See the NOTICE file distributed with this work for additional
- *  *  information regarding copyright ownership.
- *  * Unless required by applicable law or agreed to in writing, software
- *  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  * License for the specific language governing permissions and limitations
- *  * under the License.
- *  *
- *  * SPDX-License-Identifier: Apache-2.0
- *  *****************************************************************************
- */
-
-package org.nd4j.parameterserver.status.play;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
-import org.nd4j.common.tests.BaseND4JTest;
-import play.server.Server;
-
-public class StatusServerTests extends BaseND4JTest {
-
-    @Test()
-    @Timeout(20000L)
-    public void runStatusServer() {
-        Server server = StatusServer.startServer(new InMemoryStatusStorage(), 65236);
-        server.stop();
-    }
-
-}
diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/test/java/org/nd4j/parameterserver/status/play/StorageTests.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/test/java/org/nd4j/parameterserver/status/play/StorageTests.java
deleted file mode 100644
index 7d0ac67c8..000000000
--- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/test/java/org/nd4j/parameterserver/status/play/StorageTests.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  ******************************************************************************
- *  *
- *  *
- *  * This program and the accompanying materials are made available under the
- *  * terms of the Apache License, Version 2.0 which is available at
- *  * https://www.apache.org/licenses/LICENSE-2.0.
- *  *
- *  *  See the NOTICE file distributed with this work for additional
- *  *  information regarding copyright ownership.
- *  * Unless required by applicable law or agreed to in writing, software
- *  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  * License for the specific language governing permissions and limitations
- *  * under the License.
- *  *
- *  * SPDX-License-Identifier: Apache-2.0
- *  *****************************************************************************
- */
-
-package org.nd4j.parameterserver.status.play;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
-import org.nd4j.common.tests.BaseND4JTest;
-import org.nd4j.parameterserver.model.SubscriberState;
-
-import static junit.framework.TestCase.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class StorageTests extends BaseND4JTest {
-
-    @Test()
-    @Timeout(20000L)
-    public void testMapStorage() throws Exception {
-        StatusStorage mapDb = new MapDbStatusStorage();
-        assertEquals(SubscriberState.empty(), mapDb.getState(-1));
-
-
-        SubscriberState noEmpty = SubscriberState.builder().isMaster(true).serverState("master").streamId(1).build();
-        mapDb.updateState(noEmpty);
-        assertEquals(noEmpty, mapDb.getState(1));
-
-        Thread.sleep(10000);
-        assertTrue(mapDb.numStates() == 0);
-
-    }
-
-    @Test()
-    @Timeout(20000L)
-    public void testStorage() throws Exception {
-        StatusStorage statusStorage = new InMemoryStatusStorage();
-        assertEquals(SubscriberState.empty(), statusStorage.getState(-1));
-
-
-        SubscriberState noEmpty = SubscriberState.builder().isMaster(true).serverState("master").streamId(1).build();
-        statusStorage.updateState(noEmpty);
-        assertEquals(noEmpty, statusStorage.getState(1));
-
-        Thread.sleep(10000);
-        assertTrue(statusStorage.numStates() == 0);
-
-    }
-
-}
diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/test/resources/log4j.properties b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/test/resources/log4j.properties
deleted file mode 100644
index 0b53faa91..000000000
--- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# /* ******************************************************************************
-#  *
-#  *
-#  * This program and the accompanying materials are made available under the
-#  * terms of the Apache License, Version 2.0 which is available at
-#  * https://www.apache.org/licenses/LICENSE-2.0.
-#  *
-#  *  See the NOTICE file distributed with this work for additional
-#  *  information regarding copyright ownership.
-#  * Unless required by applicable law or agreed to in writing, software
-#  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  * License for the specific language governing permissions and limitations
-#  * under the License.
-#  *
-#  * SPDX-License-Identifier: Apache-2.0
-#  ******************************************************************************/
-#
-
-
-log4j.rootLogger=ERROR, Console
-log4j.logger.play=DEBUG
-log4j.appender.Console=org.apache.log4j.ConsoleAppender
-log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p ~ %m%n
-
-log4j.appender.org.springframework=DEBUG
-log4j.appender.org.nd4j=INFO
-log4j.logger.org.nd4j.aeron.ipc=INFO
-log4j.appender.org.canova=INFO
-log4j.appender.org.deeplearning4j=INFO
-log4j.appender.opennlp.uima=OFF
-log4j.appender.org.apache.uima=OFF
-log4j.appender.org.cleartk=OFF
-
-log4j.logger.org.springframework=INFO
-log4j.logger.org.nd4j=DEBUG
-log4j.logger.org.canova=INFO
-log4j.logger.org.deeplearning4j=INFO
-log4j.logger.opennlp.uima.util=OFF
-log4j.logger.org.apache.uima=OFF
-log4j.logger.org.cleartk=OFF
-
diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/test/resources/logback.xml b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/test/resources/logback.xml
deleted file mode 100644
index 18c64d888..000000000
--- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-status/src/test/resources/logback.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--
-  ~ /* ******************************************************************************
-  ~  *
-  ~  *
-  ~  * This program and the accompanying materials are made available under the
-  ~  * terms of the Apache License, Version 2.0 which is available at
-  ~  * https://www.apache.org/licenses/LICENSE-2.0.
-  ~  *
-  ~  *  See the NOTICE file distributed with this work for additional
-  ~  *  information regarding copyright ownership.
-  ~  * Unless required by applicable law or agreed to in writing, software
-  ~  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  ~  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  ~  * License for the specific language governing permissions and limitations
-  ~  * under the License.
-  ~  *
-  ~  * SPDX-License-Identifier: Apache-2.0
-  ~  ******************************************************************************/
-  -->
-
-<configuration>
-
-
-
-    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-        <file>logs/application.log</file>
-        <encoder>
-            <pattern> %logger{15} - %message%n%xException{5}
-            </pattern>
-        </encoder>
-    </appender>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern> %logger{15} - %message%n%xException{5}
-            </pattern>
-        </encoder>
-    </appender>
-
-    <logger name="org.apache.catalina.core" level="DEBUG" />
-    <logger name="org.springframework" level="DEBUG" />
-    <logger name="org.deeplearning4j" level="INFO" />
-    <logger name="org.canova" level="INFO" />
-    <logger name="org.nd4j" level="DEBUG" />
-    <logger name="opennlp.uima.util" level="OFF" />
-    <logger name="org.apache.uima" level="OFF" />
-    <logger name="org.cleartk" level="OFF" />
-
-
-
-    <root level="ERROR">
-        <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE" />
-    </root>
-
-</configuration>
\ No newline at end of file
diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/src/test/java/org/nd4j/parameterserver/updater/ParameterServerUpdaterTests.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/src/test/java/org/nd4j/parameterserver/updater/ParameterServerUpdaterTests.java
index 37b995b16..a896618d8 100644
--- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/src/test/java/org/nd4j/parameterserver/updater/ParameterServerUpdaterTests.java
+++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/src/test/java/org/nd4j/parameterserver/updater/ParameterServerUpdaterTests.java
@@ -28,9 +28,8 @@ import org.nd4j.aeron.ndarrayholder.InMemoryNDArrayHolder;
 import org.nd4j.linalg.factory.Nd4j;
 import org.nd4j.parameterserver.updater.storage.NoUpdateStorage;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.Assume.assumeNotNull;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assumptions.*;
 
 public class ParameterServerUpdaterTests extends BaseND4JTest {
 
@@ -47,7 +46,7 @@ public class ParameterServerUpdaterTests extends BaseND4JTest {
         assertTrue(updater.shouldReplicate());
         updater.reset();
         assertFalse(updater.shouldReplicate());
-        assumeNotNull(updater.toJson());
+        assertNotNull(updater.toJson());
 
 
     }
diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/src/test/java/org/nd4j/parameterserver/updater/storage/UpdaterStorageTests.java b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/src/test/java/org/nd4j/parameterserver/updater/storage/UpdaterStorageTests.java
index 1efbc3e09..7a55484a0 100644
--- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/src/test/java/org/nd4j/parameterserver/updater/storage/UpdaterStorageTests.java
+++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server/src/test/java/org/nd4j/parameterserver/updater/storage/UpdaterStorageTests.java
@@ -26,7 +26,8 @@ import org.nd4j.common.tests.BaseND4JTest;
 import org.nd4j.aeron.ipc.NDArrayMessage;
 import org.nd4j.linalg.factory.Nd4j;
 
-import static junit.framework.TestCase.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class UpdaterStorageTests extends BaseND4JTest {
diff --git a/nd4j/nd4j-parameter-server-parent/pom.xml b/nd4j/nd4j-parameter-server-parent/pom.xml
index ca8ff18f5..317da0c84 100644
--- a/nd4j/nd4j-parameter-server-parent/pom.xml
+++ b/nd4j/nd4j-parameter-server-parent/pom.xml
@@ -40,7 +40,6 @@
         <module>nd4j-parameter-server</module>
         <module>nd4j-parameter-server-client</module>
         <module>nd4j-parameter-server-model</module>
-        <module>nd4j-parameter-server-status</module>
         <module>nd4j-parameter-server-rocksdb-storage</module>
         <module>nd4j-parameter-server-node</module>
     </modules>
diff --git a/nd4j/nd4j-tvm/src/test/java/org/nd4j/tvm/runner/TvmRunnerTests.java b/nd4j/nd4j-tvm/src/test/java/org/nd4j/tvm/runner/TvmRunnerTests.java
index 567b6f192..fba116f5d 100644
--- a/nd4j/nd4j-tvm/src/test/java/org/nd4j/tvm/runner/TvmRunnerTests.java
+++ b/nd4j/nd4j-tvm/src/test/java/org/nd4j/tvm/runner/TvmRunnerTests.java
@@ -22,6 +22,7 @@ package org.nd4j.tvm.runner;
 import org.bytedeco.cpython.*;
 
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.nd4j.linalg.api.ndarray.INDArray;
 import org.nd4j.linalg.factory.Nd4j;
@@ -37,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.io.TempDir;
 
-
+@Disabled
 public class TvmRunnerTests {
 
     static void PrepareTestLibs(String libPath) throws Exception {
diff --git a/nd4j/samediff-import/samediff-import-onnx/onnx-processes.pbtxt b/nd4j/samediff-import/samediff-import-onnx/onnx-processes.pbtxt
index 7ce82052d..b8cb3531b 100644
--- a/nd4j/samediff-import/samediff-import-onnx/onnx-processes.pbtxt
+++ b/nd4j/samediff-import/samediff-import-onnx/onnx-processes.pbtxt
@@ -142,6 +142,7 @@ mappings {
   rule {
     ruleName: "listnumbertolistnumber"
     functionName: "listnumbertolistnumber"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axes"
@@ -768,6 +769,7 @@ mappings {
     ruleName: "valuemapping"
     functionName: "valuemapping"
     inputIntName: "axis"
+    outputIntName: "concatDimension"
     inputToOutput {
       key: "concatDimension"
       value: "axis"
@@ -995,6 +997,7 @@ mappings {
   rule {
     ruleName: "listnumbertolistnumber"
     functionName: "listnumbertolistnumber"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axes"
@@ -1271,6 +1274,7 @@ mappings {
   rule {
     ruleName: "listnumbertolistnumber"
     functionName: "listnumbertolistnumber"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axes"
@@ -1378,6 +1382,7 @@ mappings {
   rule {
     ruleName: "listnumbertolistnumber"
     functionName: "listnumbertolistnumber"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axes"
@@ -1474,9 +1479,9 @@ mappings {
     ruleName: "valuemapping"
     functionName: "valuemapping"
     inputIntName: "axis"
-    outputIntName: "dimensions"
+    outputIntName: "flattenDimension"
     inputToOutput {
-      key: "dimensions"
+      key: "flattenDimension"
       value: "axis"
     }
     ruleType: "attribute"
@@ -1514,6 +1519,7 @@ mappings {
   rule {
     ruleName: "ndarrayinputtonumericalattribute"
     functionName: "ndarrayinputtonumericalattribute"
+    outputIntName: "from"
     inputToOutput {
       key: "from"
       value: "start"
@@ -1524,6 +1530,7 @@ mappings {
   rule {
     ruleName: "ndarrayinputtonumericalattribute"
     functionName: "ndarrayinputtonumericalattribute"
+    outputIntName: "to"
     inputToOutput {
       key: "to"
       value: "limit"
@@ -1534,6 +1541,7 @@ mappings {
   rule {
     ruleName: "ndarrayinputtonumericalattribute"
     functionName: "ndarrayinputtonumericalattribute"
+    outputIntName: "step"
     inputToOutput {
       key: "step"
       value: "delta"
@@ -1562,7 +1570,7 @@ mappings {
     ruleName: "listnumbertondarray"
     functionName: "listnumbertondarray"
     inputToOutput {
-      key: "permutationVector"
+      key: "permuteDims"
       value: "perm"
     }
     ruleType: "attribute"
@@ -1650,6 +1658,7 @@ mappings {
     ruleName: "valuemapping"
     functionName: "valuemapping"
     inputIntName: "axis"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axis"
@@ -1720,6 +1729,7 @@ mappings {
   rule {
     ruleName: "listnumbertolistnumber"
     functionName: "listnumbertolistnumber"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axes"
@@ -1771,6 +1781,8 @@ mappings {
     functionName: "valuemapping"
     inputFloatName: "low"
     inputFloatName: "high"
+    outputDoubleName: "min"
+    outputDoubleName: "max"
     inputToOutput {
       key: "min"
       value: "low"
@@ -2227,6 +2239,7 @@ mappings {
   rule {
     ruleName: "listnumbertolistnumber"
     functionName: "listnumbertolistnumber"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axes"
@@ -2619,8 +2632,8 @@ mappings {
     functionName: "valuemapping"
     inputIntName: "exclusive"
     inputIntName: "reverse"
-    outputBooleanName: "exclusive"
-    outputBooleanName: "reverse"
+    outputIntName: "exclusive"
+    outputIntName: "reverse"
     inputToOutput {
       key: "exclusive"
       value: "exclusive"
@@ -2635,6 +2648,7 @@ mappings {
   rule {
     ruleName: "ndarraytointattributevalue"
     functionName: "ndarraytointattributevalue"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axis"
@@ -2652,8 +2666,10 @@ mappings {
     functionName: "ndarraymapping"
     inputTensorName: "data"
     inputTensorName: "updates"
+    inputTensorName: "indices"
     outputTensorName: "operand"
     outputTensorName: "updates"
+    outputTensorName: "indices"
     inputToOutput {
       key: "operand"
       value: "data"
@@ -2662,30 +2678,11 @@ mappings {
       key: "updates"
       value: "updates"
     }
-    ruleType: "tensor"
-    inputFrameworkOpName: "ScatterElements"
-  }
-  rule {
-    ruleName: "valuemapping"
-    functionName: "valuemapping"
-    inputIntName: "axis"
-    outputIntName: "dimension"
-    inputToOutput {
-      key: "dimension"
-      value: "axis"
-    }
-    ruleType: "attribute"
-    inputFrameworkOpName: "ScatterElements"
-  }
-  rule {
-    ruleName: "ndarraytointattributevalue"
-    functionName: "ndarraytointattributevalue"
-    outputIntName: "indices"
     inputToOutput {
       key: "indices"
       value: "indices"
     }
-    ruleType: "attribute"
+    ruleType: "tensor"
     inputFrameworkOpName: "ScatterElements"
   }
 }
@@ -2767,6 +2764,7 @@ mappings {
   rule {
     ruleName: "listnumbertolistnumber"
     functionName: "listnumbertolistnumber"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axes"
@@ -2814,9 +2812,9 @@ mappings {
     ruleName: "ndarraymapping"
     functionName: "ndarraymapping"
     inputTensorName: "input"
-    outputTensorName: "shapeArray"
+    outputTensorName: "shape"
     inputToOutput {
-      key: "shapeArray"
+      key: "shape"
       value: "input"
     }
     ruleType: "tensor"
@@ -2880,6 +2878,7 @@ mappings {
   rule {
     ruleName: "listnumbertolistnumber"
     functionName: "listnumbertolistnumber"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axes"
@@ -2982,6 +2981,7 @@ mappings {
     ruleName: "valuemapping"
     functionName: "valuemapping"
     inputIntName: "axis"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axis"
diff --git a/nd4j/samediff-import/samediff-import-onnx/ops-added-new.txt b/nd4j/samediff-import/samediff-import-onnx/ops-added-new.txt
index e9e606e63..6e91f6682 100644
--- a/nd4j/samediff-import/samediff-import-onnx/ops-added-new.txt
+++ b/nd4j/samediff-import/samediff-import-onnx/ops-added-new.txt
@@ -1,2 +1,3 @@
-Constant,input
-Exp,output
+Constant,x
+Constant,y
+Or,output
diff --git a/nd4j/samediff-import/samediff-import-onnx/ops-imported-new.txt b/nd4j/samediff-import/samediff-import-onnx/ops-imported-new.txt
index 7f074f247..be77a340f 100644
--- a/nd4j/samediff-import/samediff-import-onnx/ops-imported-new.txt
+++ b/nd4j/samediff-import/samediff-import-onnx/ops-imported-new.txt
@@ -1 +1 @@
-Exp,output
+Or,output
diff --git a/nd4j/samediff-import/samediff-import-onnx/ops-removed-new.txt b/nd4j/samediff-import/samediff-import-onnx/ops-removed-new.txt
index 1aafc3b01..ea9330e63 100644
--- a/nd4j/samediff-import/samediff-import-onnx/ops-removed-new.txt
+++ b/nd4j/samediff-import/samediff-import-onnx/ops-removed-new.txt
@@ -1,2 +1,3 @@
-input
+x
+y
 output
diff --git a/nd4j/samediff-import/samediff-import-onnx/src/main/kotlin/org/nd4j/samediff/frameworkimport/onnx/definitions/OnnxOpDeclarations.kt b/nd4j/samediff-import/samediff-import-onnx/src/main/kotlin/org/nd4j/samediff/frameworkimport/onnx/definitions/OnnxOpDeclarations.kt
index bcba3cc42..4895b9d73 100644
--- a/nd4j/samediff-import/samediff-import-onnx/src/main/kotlin/org/nd4j/samediff/frameworkimport/onnx/definitions/OnnxOpDeclarations.kt
+++ b/nd4j/samediff-import/samediff-import-onnx/src/main/kotlin/org/nd4j/samediff/frameworkimport/onnx/definitions/OnnxOpDeclarations.kt
@@ -737,7 +737,7 @@ val flatten = OnnxMappingProcess(
         inputFrameworkOpName = "Flatten",
         opName = "flatten_2d",
         tensorMappingRules = listOf(mappingNDArrayInputs(mutableMapOf("input" to "input"))),
-        attributeMappingRules = listOf(valueMappings(mutableMapOf("dimensions" to "axis"))),
+        attributeMappingRules = listOf(valueMappings(mutableMapOf("flattenDimension" to "axis"))),
         opMappingRegistry = onnxOpRegistry
 )
 
@@ -761,10 +761,8 @@ val scatter = OnnxMappingProcess(
         opMappingRegistry = onnxOpRegistry,
         inputFrameworkOpName = "ScatterElements",
         opName = "scatter_update",
-        attributeMappingRules =   listOf(
-                valueMappings(mutableMapOf("dimension" to "axis")),
-                ndarrayToIntList(ndarrayNameToAttributeName = mutableMapOf("indices" to "indices"))),
-        tensorMappingRules = listOf(mappingNDArrayInputs(mutableMapOf("operand" to "data","updates" to "updates")))
+        attributeMappingRules =   listOf(),
+        tensorMappingRules = listOf(mappingNDArrayInputs(mutableMapOf("operand" to "data","updates" to "updates","indices" to "indices")))
 )
 
 /*
diff --git a/nd4j/samediff-import/samediff-import-onnx/src/main/resources/onnx-mapping-ruleset.pbtxt b/nd4j/samediff-import/samediff-import-onnx/src/main/resources/onnx-mapping-ruleset.pbtxt
index 16ceb8b91..b8cb3531b 100644
--- a/nd4j/samediff-import/samediff-import-onnx/src/main/resources/onnx-mapping-ruleset.pbtxt
+++ b/nd4j/samediff-import/samediff-import-onnx/src/main/resources/onnx-mapping-ruleset.pbtxt
@@ -142,6 +142,7 @@ mappings {
   rule {
     ruleName: "listnumbertolistnumber"
     functionName: "listnumbertolistnumber"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axes"
@@ -768,6 +769,7 @@ mappings {
     ruleName: "valuemapping"
     functionName: "valuemapping"
     inputIntName: "axis"
+    outputIntName: "concatDimension"
     inputToOutput {
       key: "concatDimension"
       value: "axis"
@@ -995,6 +997,7 @@ mappings {
   rule {
     ruleName: "listnumbertolistnumber"
     functionName: "listnumbertolistnumber"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axes"
@@ -1271,6 +1274,7 @@ mappings {
   rule {
     ruleName: "listnumbertolistnumber"
     functionName: "listnumbertolistnumber"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axes"
@@ -1378,6 +1382,7 @@ mappings {
   rule {
     ruleName: "listnumbertolistnumber"
     functionName: "listnumbertolistnumber"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axes"
@@ -1474,9 +1479,9 @@ mappings {
     ruleName: "valuemapping"
     functionName: "valuemapping"
     inputIntName: "axis"
-    outputIntName: "dimensions"
+    outputIntName: "flattenDimension"
     inputToOutput {
-      key: "dimensions"
+      key: "flattenDimension"
       value: "axis"
     }
     ruleType: "attribute"
@@ -1514,6 +1519,7 @@ mappings {
   rule {
     ruleName: "ndarrayinputtonumericalattribute"
     functionName: "ndarrayinputtonumericalattribute"
+    outputIntName: "from"
     inputToOutput {
       key: "from"
       value: "start"
@@ -1524,6 +1530,7 @@ mappings {
   rule {
     ruleName: "ndarrayinputtonumericalattribute"
     functionName: "ndarrayinputtonumericalattribute"
+    outputIntName: "to"
     inputToOutput {
       key: "to"
       value: "limit"
@@ -1534,6 +1541,7 @@ mappings {
   rule {
     ruleName: "ndarrayinputtonumericalattribute"
     functionName: "ndarrayinputtonumericalattribute"
+    outputIntName: "step"
     inputToOutput {
       key: "step"
       value: "delta"
@@ -1650,6 +1658,7 @@ mappings {
     ruleName: "valuemapping"
     functionName: "valuemapping"
     inputIntName: "axis"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axis"
@@ -1720,6 +1729,7 @@ mappings {
   rule {
     ruleName: "listnumbertolistnumber"
     functionName: "listnumbertolistnumber"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axes"
@@ -1771,6 +1781,8 @@ mappings {
     functionName: "valuemapping"
     inputFloatName: "low"
     inputFloatName: "high"
+    outputDoubleName: "min"
+    outputDoubleName: "max"
     inputToOutput {
       key: "min"
       value: "low"
@@ -2227,6 +2239,7 @@ mappings {
   rule {
     ruleName: "listnumbertolistnumber"
     functionName: "listnumbertolistnumber"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axes"
@@ -2619,8 +2632,8 @@ mappings {
     functionName: "valuemapping"
     inputIntName: "exclusive"
     inputIntName: "reverse"
-    outputBooleanName: "exclusive"
-    outputBooleanName: "reverse"
+    outputIntName: "exclusive"
+    outputIntName: "reverse"
     inputToOutput {
       key: "exclusive"
       value: "exclusive"
@@ -2635,6 +2648,7 @@ mappings {
   rule {
     ruleName: "ndarraytointattributevalue"
     functionName: "ndarraytointattributevalue"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axis"
@@ -2652,8 +2666,10 @@ mappings {
     functionName: "ndarraymapping"
     inputTensorName: "data"
     inputTensorName: "updates"
+    inputTensorName: "indices"
     outputTensorName: "operand"
     outputTensorName: "updates"
+    outputTensorName: "indices"
     inputToOutput {
       key: "operand"
       value: "data"
@@ -2662,30 +2678,11 @@ mappings {
       key: "updates"
       value: "updates"
     }
-    ruleType: "tensor"
-    inputFrameworkOpName: "ScatterElements"
-  }
-  rule {
-    ruleName: "valuemapping"
-    functionName: "valuemapping"
-    inputIntName: "axis"
-    outputIntName: "dimension"
-    inputToOutput {
-      key: "dimension"
-      value: "axis"
-    }
-    ruleType: "attribute"
-    inputFrameworkOpName: "ScatterElements"
-  }
-  rule {
-    ruleName: "ndarraytointattributevalue"
-    functionName: "ndarraytointattributevalue"
-    outputIntName: "indices"
     inputToOutput {
       key: "indices"
       value: "indices"
     }
-    ruleType: "attribute"
+    ruleType: "tensor"
     inputFrameworkOpName: "ScatterElements"
   }
 }
@@ -2767,6 +2764,7 @@ mappings {
   rule {
     ruleName: "listnumbertolistnumber"
     functionName: "listnumbertolistnumber"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axes"
@@ -2880,6 +2878,7 @@ mappings {
   rule {
     ruleName: "listnumbertolistnumber"
     functionName: "listnumbertolistnumber"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axes"
@@ -2982,6 +2981,7 @@ mappings {
     ruleName: "valuemapping"
     functionName: "valuemapping"
     inputIntName: "axis"
+    outputIntName: "dimensions"
     inputToOutput {
       key: "dimensions"
       value: "axis"
diff --git a/nd4j/samediff-import/samediff-import-onnx/src/test/kotlin/org/nd4j/samediff/frameworkimport/onnx/TestOnnxIR.kt b/nd4j/samediff-import/samediff-import-onnx/src/test/kotlin/org/nd4j/samediff/frameworkimport/onnx/TestOnnxIR.kt
index 6ce83d1b6..cb6d9b80e 100644
--- a/nd4j/samediff-import/samediff-import-onnx/src/test/kotlin/org/nd4j/samediff/frameworkimport/onnx/TestOnnxIR.kt
+++ b/nd4j/samediff-import/samediff-import-onnx/src/test/kotlin/org/nd4j/samediff/frameworkimport/onnx/TestOnnxIR.kt
@@ -206,6 +206,7 @@ class TestOnnxIR {
     }
 
     @Test
+    @Disabled
     fun testOpExecution() {
         val onnxOpRegistry = registry()
 
diff --git a/nd4j/samediff-import/samediff-import-onnx/src/test/kotlin/org/nd4j/samediff/frameworkimport/onnx/importer/TestOnnxFrameworkImporter.kt b/nd4j/samediff-import/samediff-import-onnx/src/test/kotlin/org/nd4j/samediff/frameworkimport/onnx/importer/TestOnnxFrameworkImporter.kt
index 4c6ea41f0..971f4ac63 100644
--- a/nd4j/samediff-import/samediff-import-onnx/src/test/kotlin/org/nd4j/samediff/frameworkimport/onnx/importer/TestOnnxFrameworkImporter.kt
+++ b/nd4j/samediff-import/samediff-import-onnx/src/test/kotlin/org/nd4j/samediff/frameworkimport/onnx/importer/TestOnnxFrameworkImporter.kt
@@ -19,21 +19,12 @@
  */
 package org.nd4j.samediff.frameworkimport.onnx.importer
 
-import junit.framework.Assert.assertNotNull
 import org.junit.jupiter.api.Disabled
 import org.junit.Test
+import org.junit.jupiter.api.Assertions.assertNotNull
 import org.nd4j.common.io.ClassPathResource
 
 class TestOnnxFrameworkImporter {
-    @Test
-    @Disabled
-    fun testOnnxImporter() {
-        val onnxImport = OnnxFrameworkImporter()
-        val onnxFile = ClassPathResource("lenet.onnx").file
-        val graph  = onnxImport.runImport(onnxFile.absolutePath)
-        //note this is just a test to make sure everything runs, we test the underlying import elsewhere
-        assertNotNull(graph)
 
-    }
 
 }
\ No newline at end of file
diff --git a/nd4j/samediff-import/samediff-import-onnx/src/test/kotlin/org/nd4j/samediff/frameworkimport/onnx/loader/TestOnnxProcessLoader.kt b/nd4j/samediff-import/samediff-import-onnx/src/test/kotlin/org/nd4j/samediff/frameworkimport/onnx/loader/TestOnnxProcessLoader.kt
index b780b6005..bf6172c53 100644
--- a/nd4j/samediff-import/samediff-import-onnx/src/test/kotlin/org/nd4j/samediff/frameworkimport/onnx/loader/TestOnnxProcessLoader.kt
+++ b/nd4j/samediff-import/samediff-import-onnx/src/test/kotlin/org/nd4j/samediff/frameworkimport/onnx/loader/TestOnnxProcessLoader.kt
@@ -22,6 +22,7 @@ package org.nd4j.samediff.frameworkimport.onnx.loader
 
 import junit.framework.Assert
 import onnx.Onnx
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.nd4j.samediff.frameworkimport.onnx.definitions.registry
 import org.nd4j.samediff.frameworkimport.onnx.process.OnnxMappingProcessLoader
@@ -44,10 +45,11 @@ class TestOnnxProcessLoader {
                 val process = registry().lookupOpMappingProcess(name)
                 val serialized = process.serialize()
                 val created = loader.createProcess(serialized)
-                Assert.assertEquals(
-                    "Op name $name failed with process tensor rules ${process.tensorMappingRules()} and created tensor rules ${created.tensorMappingRules()} with attributes ${process.attributeMappingRules()} and created attribute rules ${created.attributeMappingRules()}",
+                assertEquals(
                     process,
-                    created
+                    created,
+                    "Op name $name failed with process tensor rules ${process.tensorMappingRules()} and created tensor rules ${created.tensorMappingRules()} with attributes ${process.attributeMappingRules()} and created attribute rules ${created.attributeMappingRules()}",
+
                 )
             }
 
diff --git a/nd4j/samediff-import/samediff-import-tensorflow/ops-added-new.txt b/nd4j/samediff-import/samediff-import-tensorflow/ops-added-new.txt
index efaa60404..e7d9f8dba 100644
--- a/nd4j/samediff-import/samediff-import-tensorflow/ops-added-new.txt
+++ b/nd4j/samediff-import/samediff-import-tensorflow/ops-added-new.txt
@@ -1,5 +1,40 @@
-Const,in_0
-Const,Roll/shift
-Const,Roll/axis
-Identity,in_0/read
-Roll,Roll
+Placeholder,input
+Const,Reshape/shape
+Const,Lenet/conv1/weights
+Const,Lenet/conv1/biases
+Const,Lenet/conv3/weights
+Const,Lenet/conv3/biases
+Const,Lenet/conv5/weights
+Const,Lenet/conv5/biases
+Const,Lenet/fc7/weights
+Const,Lenet/fc7/biases
+Const,Lenet/fc9/weights
+Const,Lenet/fc9/biases
+Const,Lenet/flat6_1/flatten/strided_slice/stack
+Const,Lenet/flat6_1/flatten/strided_slice/stack_1
+Const,Lenet/flat6_1/flatten/strided_slice/stack_2
+Const,Lenet/flat6_1/flatten/Reshape/shape/1
+Const,output/dimension
+Reshape,Reshape
+Conv2D,Lenet/conv1_1/Conv2D
+BiasAdd,Lenet/conv1_1/BiasAdd
+Relu,Lenet/conv1_1/Relu
+MaxPool,Lenet/pool2_1/MaxPool
+Conv2D,Lenet/conv3_1/Conv2D
+BiasAdd,Lenet/conv3_1/BiasAdd
+Relu,Lenet/conv3_1/Relu
+MaxPool,Lenet/pool4_1/MaxPool
+Conv2D,Lenet/conv5_1/Conv2D
+BiasAdd,Lenet/conv5_1/BiasAdd
+Relu,Lenet/conv5_1/Relu
+Shape,Lenet/flat6_1/flatten/Shape
+StridedSlice,Lenet/flat6_1/flatten/strided_slice
+Pack,Lenet/flat6_1/flatten/Reshape/shape
+Reshape,Lenet/flat6_1/flatten/Reshape
+MatMul,Lenet/fc7_1/MatMul
+BiasAdd,Lenet/fc7_1/BiasAdd
+Relu,Lenet/fc7_1/Relu
+MatMul,Lenet/fc9_1/MatMul
+BiasAdd,Lenet/fc9_1/BiasAdd
+Relu,Lenet/fc9_1/Relu
+ArgMax,output
diff --git a/nd4j/samediff-import/samediff-import-tensorflow/ops-added-old.txt b/nd4j/samediff-import/samediff-import-tensorflow/ops-added-old.txt
index efaa60404..c51c0c7c6 100644
--- a/nd4j/samediff-import/samediff-import-tensorflow/ops-added-old.txt
+++ b/nd4j/samediff-import/samediff-import-tensorflow/ops-added-old.txt
@@ -1,5 +1,3 @@
-Const,in_0
-Const,Roll/shift
-Const,Roll/axis
-Identity,in_0/read
-Roll,Roll
+Const,alpha
+Const,Sum/reduction_indices
+Sum,Sum
diff --git a/nd4j/samediff-import/samediff-import-tensorflow/ops-imported-new.txt b/nd4j/samediff-import/samediff-import-tensorflow/ops-imported-new.txt
index 6a6ace417..cf593bdc9 100644
--- a/nd4j/samediff-import/samediff-import-tensorflow/ops-imported-new.txt
+++ b/nd4j/samediff-import/samediff-import-tensorflow/ops-imported-new.txt
@@ -1,2 +1,23 @@
-Identity,in_0/read
-Roll,Roll
+Reshape,Reshape
+Conv2D,Lenet/conv1_1/Conv2D
+BiasAdd,Lenet/conv1_1/BiasAdd
+Relu,Lenet/conv1_1/Relu
+MaxPool,Lenet/pool2_1/MaxPool
+Conv2D,Lenet/conv3_1/Conv2D
+BiasAdd,Lenet/conv3_1/BiasAdd
+Relu,Lenet/conv3_1/Relu
+MaxPool,Lenet/pool4_1/MaxPool
+Conv2D,Lenet/conv5_1/Conv2D
+BiasAdd,Lenet/conv5_1/BiasAdd
+Relu,Lenet/conv5_1/Relu
+Shape,Lenet/flat6_1/flatten/Shape
+StridedSlice,Lenet/flat6_1/flatten/strided_slice
+Pack,Lenet/flat6_1/flatten/Reshape/shape
+Reshape,Lenet/flat6_1/flatten/Reshape
+MatMul,Lenet/fc7_1/MatMul
+BiasAdd,Lenet/fc7_1/BiasAdd
+Relu,Lenet/fc7_1/Relu
+MatMul,Lenet/fc9_1/MatMul
+BiasAdd,Lenet/fc9_1/BiasAdd
+Relu,Lenet/fc9_1/Relu
+ArgMax,output
diff --git a/nd4j/samediff-import/samediff-import-tensorflow/ops-imported-old.txt b/nd4j/samediff-import/samediff-import-tensorflow/ops-imported-old.txt
index 6a6ace417..c273a0be4 100644
--- a/nd4j/samediff-import/samediff-import-tensorflow/ops-imported-old.txt
+++ b/nd4j/samediff-import/samediff-import-tensorflow/ops-imported-old.txt
@@ -1,2 +1 @@
-Identity,in_0/read
-Roll,Roll
+Sum,Sum
diff --git a/nd4j/samediff-import/samediff-import-tensorflow/ops-removed-new.txt b/nd4j/samediff-import/samediff-import-tensorflow/ops-removed-new.txt
index 99e2ebb0b..ed18a8292 100644
--- a/nd4j/samediff-import/samediff-import-tensorflow/ops-removed-new.txt
+++ b/nd4j/samediff-import/samediff-import-tensorflow/ops-removed-new.txt
@@ -1,5 +1,40 @@
-in_0
-Roll/shift
-Roll/axis
-in_0/read
-Roll
+input
+Reshape/shape
+Lenet/conv1/weights
+Lenet/conv1/biases
+Lenet/conv3/weights
+Lenet/conv3/biases
+Lenet/conv5/weights
+Lenet/conv5/biases
+Lenet/fc7/weights
+Lenet/fc7/biases
+Lenet/fc9/weights
+Lenet/fc9/biases
+Lenet/flat6_1/flatten/strided_slice/stack
+Lenet/flat6_1/flatten/strided_slice/stack_1
+Lenet/flat6_1/flatten/strided_slice/stack_2
+Lenet/flat6_1/flatten/Reshape/shape/1
+output/dimension
+Reshape
+Lenet/conv1_1/Conv2D
+Lenet/conv1_1/BiasAdd
+Lenet/conv1_1/Relu
+Lenet/pool2_1/MaxPool
+Lenet/conv3_1/Conv2D
+Lenet/conv3_1/BiasAdd
+Lenet/conv3_1/Relu
+Lenet/pool4_1/MaxPool
+Lenet/conv5_1/Conv2D
+Lenet/conv5_1/BiasAdd
+Lenet/conv5_1/Relu
+Lenet/flat6_1/flatten/Shape
+Lenet/flat6_1/flatten/strided_slice
+Lenet/flat6_1/flatten/Reshape/shape
+Lenet/flat6_1/flatten/Reshape
+Lenet/fc7_1/MatMul
+Lenet/fc7_1/BiasAdd
+Lenet/fc7_1/Relu
+Lenet/fc9_1/MatMul
+Lenet/fc9_1/BiasAdd
+Lenet/fc9_1/Relu
+output
diff --git a/nd4j/samediff-import/samediff-import-tensorflow/ops-removed-old.txt b/nd4j/samediff-import/samediff-import-tensorflow/ops-removed-old.txt
index 99e2ebb0b..a461cb4ad 100644
--- a/nd4j/samediff-import/samediff-import-tensorflow/ops-removed-old.txt
+++ b/nd4j/samediff-import/samediff-import-tensorflow/ops-removed-old.txt
@@ -1,5 +1,3 @@
-in_0
-Roll/shift
-Roll/axis
-in_0/read
-Roll
+alpha
+Sum/reduction_indices
+Sum
diff --git a/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/ByteOrderTests.java b/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/ByteOrderTests.java
index 78b46eb60..af76f76cb 100644
--- a/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/ByteOrderTests.java
+++ b/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/ByteOrderTests.java
@@ -52,9 +52,9 @@ public class ByteOrderTests  extends BaseNd4jTestWithBackends {
         NativeOpsHolder.getInstance().getDeviceNativeOps().enableVerboseMode(false);
     }
 
-    @Test
+
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testByteArrayOrder1(Nd4jBackend backend) {
         val ndarray = Nd4j.create(DataType.FLOAT, 2).assign(1);
 
@@ -65,9 +65,9 @@ public class ByteOrderTests  extends BaseNd4jTestWithBackends {
         assertEquals(8, array.length);
     }
 
-    @Test
+
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testByteArrayOrder2(Nd4jBackend backend) {
         val original = Nd4j.linspace(1, 25, 25, DataType.FLOAT).reshape(5, 5);
         val bufferBuilder = new FlatBufferBuilder(0);
@@ -83,9 +83,8 @@ public class ByteOrderTests  extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testByteArrayOrder3(Nd4jBackend backend) {
         val original = Nd4j.linspace(1, 25, 25, DataType.FLOAT).reshape('f', 5, 5);
         val bufferBuilder = new FlatBufferBuilder(0);
@@ -100,9 +99,9 @@ public class ByteOrderTests  extends BaseNd4jTestWithBackends {
         assertEquals(original, restored);
     }
 
-    @Test
+
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testShapeStridesOf1(Nd4jBackend backend) {
         val buffer = new int[]{2, 5, 5, 5, 1, 0, 1, 99};
 
@@ -113,9 +112,9 @@ public class ByteOrderTests  extends BaseNd4jTestWithBackends {
         assertArrayEquals(new int[]{5, 1}, strides);
     }
 
-    @Test
+
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testShapeStridesOf2(Nd4jBackend backend) {
         val buffer = new int[]{3, 5, 5, 5, 25, 5, 1, 0, 1, 99};
 
@@ -126,9 +125,9 @@ public class ByteOrderTests  extends BaseNd4jTestWithBackends {
         assertArrayEquals(new int[]{25, 5, 1}, strides);
     }
 
-    @Test
+
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testScalarEncoding(Nd4jBackend backend) {
         val scalar = Nd4j.scalar(2.0f);
 
@@ -146,9 +145,9 @@ public class ByteOrderTests  extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
+
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVectorEncoding_1(Nd4jBackend backend) {
         val scalar = Nd4j.createFromArray(new float[]{1, 2, 3, 4, 5});
 
@@ -164,9 +163,9 @@ public class ByteOrderTests  extends BaseNd4jTestWithBackends {
         assertEquals(scalar, restored);
     }
 
-    @Test
+
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testVectorEncoding_2(Nd4jBackend backend) {
         val scalar = Nd4j.createFromArray(new double[]{1, 2, 3, 4, 5});
 
@@ -182,9 +181,8 @@ public class ByteOrderTests  extends BaseNd4jTestWithBackends {
         assertEquals(scalar, restored);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStringEncoding_1(Nd4jBackend backend) {
         val strings = Arrays.asList("alpha", "beta", "gamma");
         val vector = Nd4j.create(strings, 3);
diff --git a/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/ExecutionTests.java b/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/ExecutionTests.java
index 8cc8c8238..3db09f8e7 100644
--- a/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/ExecutionTests.java
+++ b/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/ExecutionTests.java
@@ -51,9 +51,8 @@ public class ExecutionTests extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testStoredGraph_1()  throws Exception {
         Nd4j.create(1);
 
diff --git a/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/NameTests.java b/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/NameTests.java
index 8f87ef93f..84241dac4 100644
--- a/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/NameTests.java
+++ b/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/NameTests.java
@@ -33,13 +33,11 @@ import org.nd4j.linalg.factory.Nd4jBackend;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @Slf4j
-
 public class NameTests  extends BaseNd4jTestWithBackends {
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNameExtraction_1(Nd4jBackend backend) {
         val str = "Name";
         val exp = "Name";
@@ -50,9 +48,8 @@ public class NameTests  extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNameExtraction_2(Nd4jBackend backend) {
         val str = "Name_2";
         val exp = "Name_2";
@@ -62,9 +59,8 @@ public class NameTests  extends BaseNd4jTestWithBackends {
         assertEquals(0, pair.getSecond().intValue());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNameExtraction_3(Nd4jBackend backend) {
         val str = "Name_1:2";
         val exp = "Name_1";
@@ -74,9 +70,8 @@ public class NameTests  extends BaseNd4jTestWithBackends {
         assertEquals(2, pair.getSecond().intValue());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNameExtraction_4(Nd4jBackend backend) {
         val str = "Name_1:1:2";
         val exp = "Name_1:1";
diff --git a/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/TensorFlowImportTest.java b/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/TensorFlowImportTest.java
index 21d502fd7..7ace1de24 100644
--- a/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/TensorFlowImportTest.java
+++ b/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/TensorFlowImportTest.java
@@ -94,16 +94,14 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         NativeOpsHolder.getInstance().getDeviceNativeOps().enableVerboseMode(false);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testClassHolder(Nd4jBackend backend) {
         DifferentialFunctionClassHolder.getInstance();
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSingleExample_1(Nd4jBackend backend) {
         val g = TFGraphMapper.importGraph(new File("C:\\Users\\raver\\Downloads\\mnist.pb"));
 
@@ -116,16 +114,14 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testAssertImport_1(Nd4jBackend backend) {
         val graph = TFGraphMapper.importGraph(new File("C:\\Users\\raver\\Downloads\\test.pb"));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArgMaxImport_2() throws Exception {
         val graph = TFGraphMapper.importGraph(new ClassPathResource("/tf_graphs/examples/reductions/argmax3,4,5_-1/frozen_graph.pbtxt").getInputStream());
 
@@ -134,9 +130,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         log.info(graph.asFlatPrint());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testArgMaxImport_1() throws Exception {
         val graph = TFGraphMapper.importGraph(new ClassPathResource("/tf_graphs/argmax.pb.txt").getInputStream());
 
@@ -148,26 +143,23 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         assertEquals(exp, result);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testHashEquality1(Nd4jBackend backend) {
         long hash = HashUtil.getLongHash("Conv2D");
         assertEquals(-1637140380760460323L, hash);
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testHashEquality2(Nd4jBackend backend) {
         long hash = HashUtil.getLongHash("switch");
         assertEquals(-1988317239813741487L, hash);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCustomOps1(Nd4jBackend backend) {
         val map = Nd4j.getExecutioner().getCustomOperations();
 
@@ -249,9 +241,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLenet() throws Exception {
         /**
          * Produced with:
@@ -276,17 +267,15 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         System.out.println(convNode);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIntermediate2() throws Exception {
         Nd4j.create(1);
         val tg = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/max_lstm.pb").getInputStream());
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIntermediate1() throws Exception {
         Nd4j.create(1);
 
@@ -306,9 +295,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIntermediateLoop1() throws Exception {
         Nd4j.create(1);
         val tg = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/simple_while.pb.txt").getInputStream());
@@ -331,9 +319,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIntermediateLoop3() throws Exception {
         Nd4j.create(1);
         val tg = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/nested_while.pb.txt").getInputStream());
@@ -507,9 +494,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
 
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testIntermediateReduction() throws Exception {
         Nd4j.create(1);
         SameDiff tg = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/reduce_dim.pb.txt").getInputStream());
@@ -575,9 +561,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         */
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testDefaultArgs(Nd4jBackend backend) {
         val op = new RectifiedLinear();
 
@@ -588,9 +573,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         assertEquals(0.0f, value.floatValue(), 1e-5f);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testInferShape() throws IOException {
         /**
          * node {
@@ -692,9 +676,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testImportMapping1() throws Exception {
         Nd4j.create(1);
         val tg = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/examples/ae_00/frozen_model.pb").getInputStream());
@@ -714,9 +697,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCondMapping1() throws Exception {
         Nd4j.create(1);
         val tg = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/examples/simpleif_0/frozen_model.pb").getInputStream());
@@ -731,9 +713,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         assertEquals(exp, array);*/
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testCondMapping2() throws Exception {
         Nd4j.create(1);
         val tg = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/examples/simpleif_0/frozen_model.pb").getInputStream());
@@ -750,9 +731,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         assertEquals(exp, array);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWhileMapping1() throws Exception {
         Nd4j.create(1);
         val tg = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/examples/simplewhile_0/frozen_model.pb").getInputStream());
@@ -771,9 +751,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         assertEquals(exp, array);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWhileMapping2() throws Exception {
         Nd4j.create(1);
         val tg = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/examples/simplewhile_0/frozen_model.pb").getInputStream());
@@ -791,9 +770,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         assertEquals(exp, array);*/
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWhileMapping3() throws Exception {
         Nd4j.create(1);
         val tg = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/examples/simplewhile_0/frozen_model.pb").getInputStream());
@@ -812,9 +790,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWhileDualMapping1() throws Exception {
         Nd4j.create(1);
         val tg = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/examples/simplewhile_1/frozen_model.pb").getInputStream());
@@ -834,9 +811,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         assertEquals(exp, array);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testWhileDualMapping2() throws Exception {
         Nd4j.create(1);
         val tg = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/examples/simplewhile_1/frozen_model.pb").getInputStream());
@@ -857,9 +833,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMixedWhileCond1() throws Exception {
         Nd4j.create(1);
         val tg = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/examples/simplewhile_nested/frozen_model.pb").getInputStream());
@@ -1015,9 +990,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         tg.asFlatFile(new File("../../../libnd4j/tests_cpu/resources/reduce_dim_true.fb"), ExecutorConfiguration.builder().outputMode(OutputMode.IMPLICIT).build(), true);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTensorArray_119_1() throws Exception {
         val tg = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/tensor_array.pb.txt").getInputStream());
         assertNotNull(tg);
@@ -1030,9 +1004,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         assertEquals(exp, array);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTensorArray_119_2() throws Exception {
         val tg = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/tensor_array_read.pb.txt").getInputStream());
         assertNotNull(tg);
@@ -1047,9 +1020,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTensorArray_119_3() throws Exception {
         Nd4j.create(1);
 
@@ -1063,9 +1035,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         assertEquals(exp, array);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testTensorArray_119_4() throws Exception {
         val tg = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/tensor_array_loop.pb.txt").getInputStream());
         assertNotNull(tg);
@@ -1079,9 +1050,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         assertEquals(exp, array);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLossImport_1() throws Exception {
         Nd4j.create(1);
         val tg = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/examples/losses/log_loss_rank2_axis1_SUM_OVER_BATCH_SIZE/frozen_model.pb").getInputStream());
@@ -1089,9 +1059,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         tg.outputAll(null);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testG_1() throws Exception {
         Nd4j.create(1);
         val tg = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/examples/g_08/frozen_model.pb").getInputStream());
@@ -1099,9 +1068,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         val g = tg.asFlatBuffers(true);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBoolImport_1() throws Exception {
         Nd4j.create(1);
         for (int e = 0; e < 1000; e++){
@@ -1114,9 +1082,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         }
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testLogical_1() throws Exception {
         Nd4j.create(1);
         val tg = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/examples/transforms/logicalxor_3,4_3,4/frozen_model.pb").getInputStream());
@@ -1124,9 +1091,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         tg.outputAll(null);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testSSD_1() throws Exception {
         // tf_graphs/examples/ssd_inception_v2_coco_2018_01_28/frozen_inference_graph.pb
         Nd4j.create(1);
@@ -1143,9 +1109,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         });
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRandomGraph() throws Exception {
         val tg = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/examples/assert_equal/scalar_float32/frozen_model.pb").getInputStream());
         assertNotNull(tg);
@@ -1153,9 +1118,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
         tg.asFlatFile(new File("../../../libnd4j/tests_cpu/resources/scalar_float32.fb"));
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testRandomGraph2() throws Exception {
         val tg = TFGraphMapper.importGraph(new File("c:\\develop\\mobilenet_v2_1.0_224_frozen.pb"));
         assertNotNull(tg);
@@ -1174,9 +1138,8 @@ public class TensorFlowImportTest extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testControlDependencies1() throws Exception {
         SameDiff sd = TFGraphMapper.importGraph(new ClassPathResource("tf_graphs/examples/cond/cond_true/frozen_model.pb").getInputStream());
 
diff --git a/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/TestReverse.java b/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/TestReverse.java
index e9677b7d2..320421f0d 100644
--- a/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/TestReverse.java
+++ b/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/TestReverse.java
@@ -38,9 +38,8 @@ public class TestReverse extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReverse(Nd4jBackend backend) {
 
         INDArray in = Nd4j.createFromArray(new double[]{1,2,3,4,5,6});
@@ -57,9 +56,8 @@ public class TestReverse extends BaseNd4jTestWithBackends {
         System.out.println(out);
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testReverse2(Nd4jBackend backend){
 
         INDArray in = Nd4j.createFromArray(new double[]{1,2,3,4,5,6});
diff --git a/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/tfgraphs/BERTGraphTest.java b/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/tfgraphs/BERTGraphTest.java
index 79051f579..a23498be8 100644
--- a/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/tfgraphs/BERTGraphTest.java
+++ b/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/tfgraphs/BERTGraphTest.java
@@ -64,9 +64,8 @@ public class BERTGraphTest extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBert(Nd4jBackend backend) throws Exception {
 
         String url = "https://dl4jdata.blob.core.windows.net/testresources/bert_mrpc_frozen_v1.zip";
@@ -277,7 +276,7 @@ public class BERTGraphTest extends BaseNd4jTestWithBackends {
 
     @Test //@Disabled   //AB ignored 08/04/2019 until fixed
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testBertTraining(Nd4jBackend backend) throws Exception {
         String url = "https://dl4jdata.blob.core.windows.net/testresources/bert_mrpc_frozen_v1.zip";
         File saveDir = new File(TFGraphTestZooModels.getBaseModelDir(), ".nd4jtests/bert_mrpc_frozen_v1");
@@ -422,7 +421,7 @@ public class BERTGraphTest extends BaseNd4jTestWithBackends {
     @Test
     @Disabled
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void writeBertUI(Nd4jBackend backend) throws Exception {
         //Test used to generate graph for visualization to work out appropriate subgraph structure to replace
         File f = new File("C:/Temp/TF_Graphs/mrpc_output/frozen/bert_mrpc_frozen.pb");
diff --git a/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/tfgraphs/CustomOpTests.java b/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/tfgraphs/CustomOpTests.java
index d00c4e1bd..36cc1f5aa 100644
--- a/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/tfgraphs/CustomOpTests.java
+++ b/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/tfgraphs/CustomOpTests.java
@@ -42,9 +42,8 @@ public class CustomOpTests extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testPad(Nd4jBackend backend){
 
         INDArray in = Nd4j.create(DataType.FLOAT, 1, 28, 28, 264);
@@ -64,9 +63,8 @@ public class CustomOpTests extends BaseNd4jTestWithBackends {
         Nd4j.getExecutioner().exec(op); //Crash here
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testResizeBilinearEdgeCase(Nd4jBackend backend){
         INDArray in = Nd4j.ones(DataType.FLOAT, 1, 1, 1, 3);
         INDArray size = Nd4j.createFromArray(8, 8);
diff --git a/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/tfgraphs/NodeReaderTests.java b/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/tfgraphs/NodeReaderTests.java
index 8643ecabd..37396222a 100644
--- a/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/tfgraphs/NodeReaderTests.java
+++ b/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/tfgraphs/NodeReaderTests.java
@@ -41,9 +41,8 @@ public class NodeReaderTests extends BaseNd4jTestWithBackends {
         return 'c';
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testNodeReader_1(Nd4jBackend backend) throws Exception {
         val array = NodeReader.readArray("ae_00", "BiasAdd.0");
         val exp = Nd4j.create(new double[]{0.75157526, 0.73641957, 0.50457279, -0.45943720, 0.58269453, 0.10282226, -0.45269983, -0.05505687, -0.46887864, -0.05584033}, new long[]{5 ,2});
diff --git a/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/tfgraphs/TFGraphTestList.java b/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/tfgraphs/TFGraphTestList.java
index 81c34c72a..86e57d8de 100644
--- a/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/tfgraphs/TFGraphTestList.java
+++ b/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/tfgraphs/TFGraphTestList.java
@@ -88,7 +88,6 @@ public class TFGraphTestList {
     }
 
 
-    @Test
     @ParameterizedTest
     @MethodSource("#data")
     public void testOutputOnly(@TempDir Path testDir,String modelName) throws IOException {
diff --git a/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/tfgraphs/ValidateZooModelPredictions.java b/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/tfgraphs/ValidateZooModelPredictions.java
index a161e24e2..10a1e2abd 100644
--- a/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/tfgraphs/ValidateZooModelPredictions.java
+++ b/nd4j/samediff-import/samediff-import-tensorflow/src/test/java/org/nd4j/imports/tfgraphs/ValidateZooModelPredictions.java
@@ -70,9 +70,8 @@ public class ValidateZooModelPredictions extends BaseNd4jTestWithBackends {
         return Long.MAX_VALUE;
     }
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testMobilenetV1(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         TFGraphTestZooModels.currentTestDir = testDir.toFile();
 
@@ -126,9 +125,8 @@ public class ValidateZooModelPredictions extends BaseNd4jTestWithBackends {
     }
 
 
-    @Test
     @ParameterizedTest
-    @MethodSource("org.nd4j.linalg.BaseNd4jTest#configs")
+    @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
     public void testResnetV2(@TempDir Path testDir,Nd4jBackend backend) throws Exception {
         if(TFGraphTestZooModels.isPPC()){
             /*
diff --git a/nd4j/samediff-import/samediff-import-tensorflow/src/test/kotlin/org/nd4j/samediff/frameworkimport/tensorflow/loader/TestTensorflowProcessLoader.kt b/nd4j/samediff-import/samediff-import-tensorflow/src/test/kotlin/org/nd4j/samediff/frameworkimport/tensorflow/loader/TestTensorflowProcessLoader.kt
index 7f4e7a40c..42b261cb2 100644
--- a/nd4j/samediff-import/samediff-import-tensorflow/src/test/kotlin/org/nd4j/samediff/frameworkimport/tensorflow/loader/TestTensorflowProcessLoader.kt
+++ b/nd4j/samediff-import/samediff-import-tensorflow/src/test/kotlin/org/nd4j/samediff/frameworkimport/tensorflow/loader/TestTensorflowProcessLoader.kt
@@ -20,8 +20,8 @@
 
 package org.nd4j.samediff.frameworkimport.tensorflow.loader
 
-import junit.framework.Assert.assertEquals
 import org.junit.Test
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.nd4j.samediff.frameworkimport.opdefs.OpDescriptorLoaderHolder
 import org.nd4j.samediff.frameworkimport.registry.OpMappingRegistry
 import org.nd4j.samediff.frameworkimport.tensorflow.definitions.registry
@@ -42,7 +42,7 @@ class TestTensorflowProcessLoader {
                 val process = registry().lookupOpMappingProcess(name)
                 val serialized = process.serialize()
                 val created = loader.createProcess(serialized)
-                assertEquals("Op name $name failed with process tensor rules ${process.tensorMappingRules()} and created tensor rules ${created.tensorMappingRules()} with attributes ${process.attributeMappingRules()} and created attribute rules ${created.attributeMappingRules()}",process,created)
+                assertEquals(process,created,"Op name $name failed with process tensor rules ${process.tensorMappingRules()} and created tensor rules ${created.tensorMappingRules()} with attributes ${process.attributeMappingRules()} and created attribute rules ${created.attributeMappingRules()}")
             }
 
         }
diff --git a/nd4j/samediff-import/samediff-import-tensorflow/variables-added-new.txt b/nd4j/samediff-import/samediff-import-tensorflow/variables-added-new.txt
index be63da579..a9255544b 100644
--- a/nd4j/samediff-import/samediff-import-tensorflow/variables-added-new.txt
+++ b/nd4j/samediff-import/samediff-import-tensorflow/variables-added-new.txt
@@ -1,2 +1,23 @@
-in_0/read,in_0/read
-Roll,Roll
+Reshape,Reshape
+Lenet/conv1_1/Conv2D,Lenet/conv1_1/Conv2D
+Lenet/conv1_1/BiasAdd,Lenet/conv1_1/BiasAdd
+Lenet/conv1_1/Relu,Lenet/conv1_1/Relu
+Lenet/pool2_1/MaxPool,Lenet/pool2_1/MaxPool
+Lenet/conv3_1/Conv2D,Lenet/conv3_1/Conv2D
+Lenet/conv3_1/BiasAdd,Lenet/conv3_1/BiasAdd
+Lenet/conv3_1/Relu,Lenet/conv3_1/Relu
+Lenet/pool4_1/MaxPool,Lenet/pool4_1/MaxPool
+Lenet/conv5_1/Conv2D,Lenet/conv5_1/Conv2D
+Lenet/conv5_1/BiasAdd,Lenet/conv5_1/BiasAdd
+Lenet/conv5_1/Relu,Lenet/conv5_1/Relu
+Lenet/flat6_1/flatten/Shape,Lenet/flat6_1/flatten/Shape
+Lenet/flat6_1/flatten/strided_slice,Lenet/flat6_1/flatten/strided_slice
+Lenet/flat6_1/flatten/Reshape/shape,Lenet/flat6_1/flatten/Reshape/shape
+Lenet/flat6_1/flatten/Reshape,Lenet/flat6_1/flatten/Reshape
+Lenet/fc7_1/MatMul,Lenet/fc7_1/MatMul
+Lenet/fc7_1/BiasAdd,Lenet/fc7_1/BiasAdd
+Lenet/fc7_1/Relu,Lenet/fc7_1/Relu
+Lenet/fc9_1/MatMul,Lenet/fc9_1/MatMul
+Lenet/fc9_1/BiasAdd,Lenet/fc9_1/BiasAdd
+Lenet/fc9_1/Relu,Lenet/fc9_1/Relu
+output,output
diff --git a/nd4j/samediff-import/samediff-import-tensorflow/variables-added-old.txt b/nd4j/samediff-import/samediff-import-tensorflow/variables-added-old.txt
index be63da579..c273a0be4 100644
--- a/nd4j/samediff-import/samediff-import-tensorflow/variables-added-old.txt
+++ b/nd4j/samediff-import/samediff-import-tensorflow/variables-added-old.txt
@@ -1,2 +1 @@
-in_0/read,in_0/read
-Roll,Roll
+Sum,Sum
diff --git a/pom.xml b/pom.xml
index 6080a69dc..791d7a4bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,7 +178,7 @@
         <javacpp.version>1.5.5</javacpp.version>
         <javacpp-presets.version>1.5.5</javacpp-presets.version>
         <javacv.version>1.5.5</javacv.version>
-         <javacpp.platform.additionalIncludePaths />
+        <javacpp.platform.additionalIncludePaths />
         <javacpp.platform.cppincludepath />
         <javacpp.platform.library.path />
         <!-- Used in nd4j-backend-impls for directory-maven-plugin to assist with finding native libs for tests -->
@@ -275,7 +275,7 @@
         </maven-git-commit-id-plugin.version>
         <maven-build-helper-plugin.version>3.0.0</maven-build-helper-plugin.version>
         <maven-play2-plugin.version>1.0.0-beta5</maven-play2-plugin.version>
-        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
         <maven-surefire.version>${maven-surefire-plugin.version}</maven-surefire.version>
         <maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
         <maven-lint-plugin.version>0.0.11</maven-lint-plugin.version>
@@ -462,6 +462,18 @@
         <!-- <sourceDirectory>contrib</sourceDirectory>-->
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven-surefire-plugin.version}</version>
+                    <inherited>true</inherited>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.maven.surefire</groupId>
+                            <artifactId>surefire-junit-platform</artifactId>
+                            <version>${maven-surefire-plugin.version}</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
                 <plugin>
                     <groupId>org.jetbrains.kotlin</groupId>
                     <artifactId>kotlin-maven-plugin</artifactId>
@@ -1146,13 +1158,14 @@
                             <environmentVariables>
                                 <DL4J_INTEGRATION_TESTS>true</DL4J_INTEGRATION_TESTS>
                             </environmentVariables>
-                           <!-- <properties>
-                                <property>
-                                    <name>listener</name>
-                                    <value>org.walkmod.junit4git.junit4.Junit4GitListener</value>
-                                </property>
-                            </properties>-->
                         </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.maven.surefire</groupId>
+                                <artifactId>surefire-junit-platform</artifactId>
+                                <version>${maven-surefire-plugin.version}</version>
+                            </dependency>
+                        </dependencies>
                     </plugin>
                 </plugins>
             </build>
diff --git a/python4j/pom.xml b/python4j/pom.xml
index c6b9e2165..bf67dd896 100644
--- a/python4j/pom.xml
+++ b/python4j/pom.xml
@@ -61,14 +61,14 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
diff --git a/python4j/python4j-core/src/test/java/PythonBasicExecutionTest.java b/python4j/python4j-core/src/test/java/PythonBasicExecutionTest.java
index 9e859651c..544af14ae 100644
--- a/python4j/python4j-core/src/test/java/PythonBasicExecutionTest.java
+++ b/python4j/python4j-core/src/test/java/PythonBasicExecutionTest.java
@@ -19,13 +19,14 @@
  */
 
 
-import org.junit.Assert;
+
 import org.junit.jupiter.api.Test;
 import org.nd4j.python4j.*;
 
 import javax.annotation.concurrent.NotThreadSafe;
 import java.util.*;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 @NotThreadSafe
@@ -59,7 +60,7 @@ public class PythonBasicExecutionTest {
             }
 
         } catch (Exception e) {
-            Assert.assertEquals("NameError: name 'printx' is not defined", e.getMessage());
+            assertEquals("NameError: name 'printx' is not defined", e.getMessage());
             return;
         }
         throw new Exception("Bad code did not throw!");
@@ -86,7 +87,7 @@ public class PythonBasicExecutionTest {
             PythonVariable out = new PythonVariable<>("z", PythonTypes.STR);
             String code = "z = x + y";
             PythonExecutioner.exec(code, inputs, Collections.singletonList(out));
-            Assert.assertEquals("Hello World", out.getValue());
+            assertEquals("Hello World", out.getValue());
         }
     }
 
@@ -97,17 +98,17 @@ public class PythonBasicExecutionTest {
             String code = "a = 5\nb = '10'\nc = 20.0";
             List<PythonVariable> vars = PythonExecutioner.execAndReturnAllVariables(code);
 
-            Assert.assertEquals("a", vars.get(0).getName());
-            Assert.assertEquals(PythonTypes.INT, vars.get(0).getType());
-            Assert.assertEquals(5L, (long) vars.get(0).getValue());
+            assertEquals("a", vars.get(0).getName());
+            assertEquals(PythonTypes.INT, vars.get(0).getType());
+            assertEquals(5L, (long) vars.get(0).getValue());
 
-            Assert.assertEquals("b", vars.get(1).getName());
-            Assert.assertEquals(PythonTypes.STR, vars.get(1).getType());
-            Assert.assertEquals("10", vars.get(1).getValue().toString());
+            assertEquals("b", vars.get(1).getName());
+            assertEquals(PythonTypes.STR, vars.get(1).getType());
+            assertEquals("10", vars.get(1).getValue().toString());
 
-            Assert.assertEquals("c", vars.get(2).getName());
-            Assert.assertEquals(PythonTypes.FLOAT, vars.get(2).getType());
-            Assert.assertEquals(20.0, (double) vars.get(2).getValue(), 1e-5);
+            assertEquals("c", vars.get(2).getName());
+            assertEquals(PythonTypes.FLOAT, vars.get(2).getType());
+            assertEquals(20.0, (double) vars.get(2).getValue(), 1e-5);
 
         }
     }
@@ -121,17 +122,17 @@ public class PythonBasicExecutionTest {
             String code = "b = '10'\nc = 20.0 + a";
             List<PythonVariable> vars = PythonExecutioner.execAndReturnAllVariables(code, inputs);
 
-            Assert.assertEquals("a", vars.get(0).getName());
-            Assert.assertEquals(PythonTypes.INT, vars.get(0).getType());
-            Assert.assertEquals(5L, (long) vars.get(0).getValue());
+            assertEquals("a", vars.get(0).getName());
+            assertEquals(PythonTypes.INT, vars.get(0).getType());
+            assertEquals(5L, (long) vars.get(0).getValue());
 
-            Assert.assertEquals("b", vars.get(1).getName());
-            Assert.assertEquals(PythonTypes.STR, vars.get(1).getType());
-            Assert.assertEquals("10", vars.get(1).getValue().toString());
+            assertEquals("b", vars.get(1).getName());
+            assertEquals(PythonTypes.STR, vars.get(1).getType());
+            assertEquals("10", vars.get(1).getValue().toString());
 
-            Assert.assertEquals("c", vars.get(2).getName());
-            Assert.assertEquals(PythonTypes.FLOAT, vars.get(2).getType());
-            Assert.assertEquals(25.0, (double) vars.get(2).getValue(), 1e-5);
+            assertEquals("c", vars.get(2).getName());
+            assertEquals(PythonTypes.FLOAT, vars.get(2).getType());
+            assertEquals(25.0, (double) vars.get(2).getValue(), 1e-5);
 
         }
     }
diff --git a/python4j/python4j-core/src/test/java/PythonCollectionsTest.java b/python4j/python4j-core/src/test/java/PythonCollectionsTest.java
index 395582d8a..41c19d1f1 100644
--- a/python4j/python4j-core/src/test/java/PythonCollectionsTest.java
+++ b/python4j/python4j-core/src/test/java/PythonCollectionsTest.java
@@ -20,11 +20,13 @@
 
 
 import org.nd4j.python4j.*;
-import org.junit.Assert;
+
 import org.junit.jupiter.api.Test;
 
 import java.util.*;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 
 @javax.annotation.concurrent.NotThreadSafe
 public class PythonCollectionsTest {
@@ -44,7 +46,7 @@ public class PythonCollectionsTest {
           map.put("list2", Arrays.asList(4, "5", innerMap, false, true));
           PythonObject dict = PythonTypes.convert(map);
           Map map2 = PythonTypes.DICT.toJava(dict);
-          Assert.assertEquals(map.toString(), map2.toString());
+          assertEquals(map.toString(), map2.toString());
       }
 
     }
@@ -63,7 +65,7 @@ public class PythonCollectionsTest {
             list.add(map);
             PythonObject dict = PythonTypes.convert(list);
             List list2 = PythonTypes.LIST.toJava(dict);
-            Assert.assertEquals(list.toString(), list2.toString());
+            assertEquals(list.toString(), list2.toString());
         }
 
     }
diff --git a/python4j/python4j-core/src/test/java/PythonContextManagerTest.java b/python4j/python4j-core/src/test/java/PythonContextManagerTest.java
index ef06d5095..32ec7e5c7 100644
--- a/python4j/python4j-core/src/test/java/PythonContextManagerTest.java
+++ b/python4j/python4j-core/src/test/java/PythonContextManagerTest.java
@@ -23,12 +23,14 @@
 import org.nd4j.python4j.Python;
 import org.nd4j.python4j.PythonContextManager;
 import org.nd4j.python4j.PythonExecutioner;
-import org.junit.Assert;
+
 import org.junit.jupiter.api.Test;
 import org.nd4j.python4j.PythonGIL;
 
 import javax.annotation.concurrent.NotThreadSafe;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 @NotThreadSafe
 public class PythonContextManagerTest {
 
@@ -44,13 +46,13 @@ public class PythonContextManagerTest {
 
 
             Python.setContext("context1");
-            Assert.assertEquals(1, PythonExecutioner.getVariable("a").toInt());
+            assertEquals(1, PythonExecutioner.getVariable("a").toInt());
 
             Python.setContext("context2");
-            Assert.assertEquals(2, PythonExecutioner.getVariable("a").toInt());
+            assertEquals(2, PythonExecutioner.getVariable("a").toInt());
 
             Python.setContext("context3");
-            Assert.assertEquals(3, PythonExecutioner.getVariable("a").toInt());
+            assertEquals(3, PythonExecutioner.getVariable("a").toInt());
 
             PythonContextManager.deleteNonMainContexts();
 
diff --git a/python4j/python4j-core/src/test/java/PythonGCTest.java b/python4j/python4j-core/src/test/java/PythonGCTest.java
index 57dcc02ac..7e61eafc5 100644
--- a/python4j/python4j-core/src/test/java/PythonGCTest.java
+++ b/python4j/python4j-core/src/test/java/PythonGCTest.java
@@ -22,11 +22,13 @@ import org.nd4j.python4j.Python;
 import org.nd4j.python4j.PythonGC;
 import org.nd4j.python4j.PythonGIL;
 import org.nd4j.python4j.PythonObject;
-import org.junit.Assert;
+
 import org.junit.jupiter.api.Test;
 
 import javax.annotation.concurrent.NotThreadSafe;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 
 @NotThreadSafe
 public class PythonGCTest {
@@ -45,7 +47,7 @@ public class PythonGCTest {
             PythonObject pyObjCount2 = Python.len(getObjects.call());
             long objCount2 =  pyObjCount2.toLong();
             long diff = objCount2 - objCount1;
-            Assert.assertTrue(diff > 2);
+            assertTrue(diff > 2);
             try(PythonGC gc = PythonGC.watch()){
                 PythonObject pyList2 = Python.list();
                 pyList2.attr("append").call("a");
@@ -55,7 +57,7 @@ public class PythonGCTest {
             PythonObject pyObjCount3 = Python.len(getObjects.call());
             long objCount3 =  pyObjCount3.toLong();
             diff = objCount3 - objCount2;
-            Assert.assertTrue(diff <= 2);// 2 objects created during function call
+            assertTrue(diff <= 2);// 2 objects created during function call
         }
 
     }
diff --git a/python4j/python4j-core/src/test/java/PythonMultiThreadTest.java b/python4j/python4j-core/src/test/java/PythonMultiThreadTest.java
index 67e107b3a..53375dce9 100644
--- a/python4j/python4j-core/src/test/java/PythonMultiThreadTest.java
+++ b/python4j/python4j-core/src/test/java/PythonMultiThreadTest.java
@@ -41,23 +41,20 @@ public class PythonMultiThreadTest {
     @Test
     public void testMultiThreading1()throws Throwable{
         final List<Throwable> exceptions = Collections.synchronizedList(new ArrayList<Throwable>());
-        Runnable runnable = new Runnable() {
-            @Override
-            public void run() {
-                try(PythonGIL gil = PythonGIL.lock()){
-                    try(PythonGC gc = PythonGC.watch()){
-                        List<PythonVariable> inputs = new ArrayList<>();
-                        inputs.add(new PythonVariable<>("x", PythonTypes.STR, "Hello "));
-                        inputs.add(new PythonVariable<>("y", PythonTypes.STR, "World"));
-                        PythonVariable out = new PythonVariable<>("z", PythonTypes.STR);
-                        String code = "z = x + y";
-                        PythonExecutioner.exec(code, inputs, Collections.singletonList(out));
-                        assertEquals("Hello World", out.getValue());
-                        System.out.println(out.getValue() + " From thread " + Thread.currentThread().getId());
-                    }
-                }catch (Throwable e){
-                    exceptions.add(e);
+        Runnable runnable = () -> {
+            try(PythonGIL gil = PythonGIL.lock()){
+                try(PythonGC gc = PythonGC.watch()){
+                    List<PythonVariable> inputs = new ArrayList<>();
+                    inputs.add(new PythonVariable<>("x", PythonTypes.STR, "Hello "));
+                    inputs.add(new PythonVariable<>("y", PythonTypes.STR, "World"));
+                    PythonVariable out = new PythonVariable<>("z", PythonTypes.STR);
+                    String code = "z = x + y";
+                    PythonExecutioner.exec(code, inputs, Collections.singletonList(out));
+                    assertEquals("Hello World", out.getValue());
+                    System.out.println(out.getValue() + " From thread " + Thread.currentThread().getId());
                 }
+            }catch (Throwable e){
+                exceptions.add(e);
             }
         };
 
diff --git a/python4j/python4j-core/src/test/java/PythonPrimitiveTypesTest.java b/python4j/python4j-core/src/test/java/PythonPrimitiveTypesTest.java
index 980d2f72f..3081cd0dd 100644
--- a/python4j/python4j-core/src/test/java/PythonPrimitiveTypesTest.java
+++ b/python4j/python4j-core/src/test/java/PythonPrimitiveTypesTest.java
@@ -20,12 +20,15 @@
 
 
 import org.nd4j.python4j.*;
-import org.junit.Assert;
+
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class PythonPrimitiveTypesTest {
 
     @Test
@@ -35,12 +38,12 @@ public class PythonPrimitiveTypesTest {
             PythonObject p = PythonTypes.INT.toPython(j);
             long j2 = PythonTypes.INT.toJava(p);
 
-            Assert.assertEquals(j, j2);
+            assertEquals(j, j2);
 
             PythonObject p2 = PythonTypes.convert(j);
             long j3 = PythonTypes.INT.toJava(p2);
 
-            Assert.assertEquals(j, j3);
+            assertEquals(j, j3);
         }
 
     }
@@ -52,12 +55,12 @@ public class PythonPrimitiveTypesTest {
             PythonObject p = PythonTypes.STR.toPython(s);
             String s2 = PythonTypes.STR.toJava(p);
 
-            Assert.assertEquals(s, s2);
+            assertEquals(s, s2);
 
             PythonObject p2 = PythonTypes.convert(s);
             String s3 = PythonTypes.STR.toJava(p2);
 
-            Assert.assertEquals(s, s3);
+            assertEquals(s, s3);
         }
 
     }
@@ -69,12 +72,12 @@ public class PythonPrimitiveTypesTest {
             PythonObject p = PythonTypes.FLOAT.toPython(f);
             double f2 = PythonTypes.FLOAT.toJava(p);
 
-            Assert.assertEquals(f, f2, 1e-5);
+            assertEquals(f, f2, 1e-5);
 
             PythonObject p2 = PythonTypes.convert(f);
             double f3 = PythonTypes.FLOAT.toJava(p2);
 
-            Assert.assertEquals(f, f3, 1e-5);
+            assertEquals(f, f3, 1e-5);
         }
 
     }
@@ -86,12 +89,12 @@ public class PythonPrimitiveTypesTest {
             PythonObject p = PythonTypes.BOOL.toPython(b);
             boolean b2 = PythonTypes.BOOL.toJava(p);
 
-            Assert.assertEquals(b, b2);
+            assertEquals(b, b2);
 
             PythonObject p2 = PythonTypes.convert(b);
             boolean b3 = PythonTypes.BOOL.toJava(p2);
 
-            Assert.assertEquals(b, b3);
+            assertEquals(b, b3);
         }
 
     }
@@ -108,7 +111,7 @@ public class PythonPrimitiveTypesTest {
             outputs.add(new PythonVariable<>("b2", PythonTypes.BYTES));
             String code = "b2=b1";
             PythonExecutioner.exec(code, inputs, outputs);
-            Assert.assertArrayEquals(bytes, (byte[]) outputs.get(0).getValue());
+            assertArrayEquals(bytes, (byte[]) outputs.get(0).getValue());
         }
 
     }
@@ -124,8 +127,8 @@ public class PythonPrimitiveTypesTest {
             outputs.add(new PythonVariable<>("b2", PythonTypes.BYTES));
             String code = "s1 = ''.join(chr(c) for c in b1)\nb2=b'def'";
             PythonExecutioner.exec(code, inputs, outputs);
-            Assert.assertEquals("abc", outputs.get(0).getValue());
-            Assert.assertArrayEquals(new byte[]{100, 101, 102}, (byte[]) outputs.get(1).getValue());
+            assertEquals("abc", outputs.get(0).getValue());
+            assertArrayEquals(new byte[]{100, 101, 102}, (byte[]) outputs.get(1).getValue());
 
         }
     }
diff --git a/python4j/python4j-numpy/pom.xml b/python4j/python4j-numpy/pom.xml
index aa26f24b5..09cb57553 100644
--- a/python4j/python4j-numpy/pom.xml
+++ b/python4j/python4j-numpy/pom.xml
@@ -142,13 +142,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.surefire</groupId>
-                                <artifactId>surefire-junit47</artifactId>
-                                <version>2.19.1</version>
-                            </dependency>
-                        </dependencies>
+                        <inherited>true</inherited>
                         <configuration>
                             <environmentVariables>
                             </environmentVariables>
diff --git a/python4j/python4j-numpy/src/test/java/PythonNumpyBasicTest.java b/python4j/python4j-numpy/src/test/java/PythonNumpyBasicTest.java
index 85c319eb9..68d9bc4c8 100644
--- a/python4j/python4j-numpy/src/test/java/PythonNumpyBasicTest.java
+++ b/python4j/python4j-numpy/src/test/java/PythonNumpyBasicTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.nd4j.python4j.*;
-import org.junit.Assert;
+
 import org.junit.jupiter.api.Test;
 
 import org.nd4j.linalg.api.buffer.DataType;
@@ -39,6 +39,8 @@ import java.util.Collection;
 import java.util.List;
 import java.util.stream.Stream;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 @NotThreadSafe
 public class PythonNumpyBasicTest {
     public static Stream<Arguments> params() {
@@ -75,7 +77,6 @@ public class PythonNumpyBasicTest {
         return ret.stream().map(Arguments::of);
     }
 
-    @Test
     @ParameterizedTest
     @MethodSource("#params")
     public void testConversion(DataType dataType,long[] shape){
@@ -86,13 +87,12 @@ public class PythonNumpyBasicTest {
           if (dataType == DataType.BFLOAT16){
               arr = arr.castTo(DataType.FLOAT);
           }
-          Assert.assertEquals(arr,arr2);
+          assertEquals(arr,arr2);
       }
 
     }
 
 
-    @Test
     @ParameterizedTest
     @MethodSource("#params")
     public void testExecution(DataType dataType,long[] shape) {
@@ -115,15 +115,14 @@ public class PythonNumpyBasicTest {
             PythonExecutioner.exec(code, inputs, outputs);
             INDArray z2 = output.getValue();
 
-            Assert.assertEquals(z.dataType(), z2.dataType());
-            Assert.assertEquals(z, z2);
+            assertEquals(z.dataType(), z2.dataType());
+            assertEquals(z, z2);
         }
 
 
     }
 
 
-    @Test
     @ParameterizedTest
     @MethodSource("#params")
     public void testInplaceExecution(DataType dataType,long[] shape) {
@@ -144,13 +143,13 @@ public class PythonNumpyBasicTest {
             String code = "x *= y + 2";
             PythonExecutioner.exec(code, inputs, outputs);
             INDArray z2 = output.getValue();
-            Assert.assertEquals(x.dataType(), z2.dataType());
-            Assert.assertEquals(z.dataType(), z2.dataType());
-            Assert.assertEquals(x, z2);
-            Assert.assertEquals(z, z2);
-            Assert.assertEquals(x.data().pointer().address(), z2.data().pointer().address());
+            assertEquals(x.dataType(), z2.dataType());
+            assertEquals(z.dataType(), z2.dataType());
+            assertEquals(x, z2);
+            assertEquals(z, z2);
+            assertEquals(x.data().pointer().address(), z2.data().pointer().address());
             if("CUDA".equalsIgnoreCase(Nd4j.getExecutioner().getEnvironmentInformation().getProperty("backend"))){
-                Assert.assertEquals(getDeviceAddress(x), getDeviceAddress(z2));
+                assertEquals(getDeviceAddress(x), getDeviceAddress(z2));
             }
 
         }
diff --git a/python4j/python4j-numpy/src/test/java/PythonNumpyCollectionsTest.java b/python4j/python4j-numpy/src/test/java/PythonNumpyCollectionsTest.java
index c3198c19f..7c4ef90b5 100644
--- a/python4j/python4j-numpy/src/test/java/PythonNumpyCollectionsTest.java
+++ b/python4j/python4j-numpy/src/test/java/PythonNumpyCollectionsTest.java
@@ -26,7 +26,7 @@ import org.nd4j.python4j.PythonException;
 import org.nd4j.python4j.PythonGIL;
 import org.nd4j.python4j.PythonObject;
 import org.nd4j.python4j.PythonTypes;
-import org.junit.Assert;
+
 import org.junit.jupiter.api.Test;
 
 import org.nd4j.linalg.api.buffer.DataType;
@@ -36,6 +36,8 @@ import javax.annotation.concurrent.NotThreadSafe;
 import java.util.*;
 import java.util.stream.Stream;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 
 @NotThreadSafe
 public class PythonNumpyCollectionsTest {
@@ -77,7 +79,7 @@ public class PythonNumpyCollectionsTest {
             map.put("list2", Arrays.asList(4, "5", innerMap, false, true));
             PythonObject dict = PythonTypes.convert(map);
             Map map2 = PythonTypes.DICT.toJava(dict);
-            Assert.assertEquals(map.toString(), map2.toString());
+            assertEquals(map.toString(), map2.toString());
         }
 
     }
@@ -102,7 +104,7 @@ public class PythonNumpyCollectionsTest {
             list.add(map);
             PythonObject dict = PythonTypes.convert(list);
             List list2 = PythonTypes.LIST.toJava(dict);
-            Assert.assertEquals(list.toString(), list2.toString());
+            assertEquals(list.toString(), list2.toString());
         }
 
     }
diff --git a/python4j/python4j-numpy/src/test/java/PythonNumpyGCTest.java b/python4j/python4j-numpy/src/test/java/PythonNumpyGCTest.java
index 997eda5e8..b39b38e86 100644
--- a/python4j/python4j-numpy/src/test/java/PythonNumpyGCTest.java
+++ b/python4j/python4j-numpy/src/test/java/PythonNumpyGCTest.java
@@ -22,12 +22,14 @@ import org.nd4j.python4j.Python;
 import org.nd4j.python4j.PythonGC;
 import org.nd4j.python4j.PythonGIL;
 import org.nd4j.python4j.PythonObject;
-import org.junit.Assert;
+
 import org.junit.jupiter.api.Test;
 import org.nd4j.linalg.factory.Nd4j;
 
 import javax.annotation.concurrent.NotThreadSafe;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 
 @NotThreadSafe
 public class PythonNumpyGCTest {
@@ -46,7 +48,7 @@ public class PythonNumpyGCTest {
             PythonObject pyObjCount2 = Python.len(getObjects.call());
             long objCount2 =  pyObjCount2.toLong();
             long diff = objCount2 - objCount1;
-            Assert.assertTrue(diff > 2);
+            assertTrue(diff > 2);
             try(PythonGC gc = PythonGC.watch()){
                 PythonObject pyList2 = Python.list();
                 pyList2.attr("append").call(new PythonObject(Nd4j.linspace(1, 10, 10)));
@@ -56,7 +58,7 @@ public class PythonNumpyGCTest {
             PythonObject pyObjCount3 = Python.len(getObjects.call());
             long objCount3 =  pyObjCount3.toLong();
             diff = objCount3 - objCount2;
-            Assert.assertTrue(diff <= 2);// 2 objects created during function call
+            assertTrue(diff <= 2);// 2 objects created during function call
         }
 
     }
diff --git a/python4j/python4j-numpy/src/test/java/PythonNumpyImportTest.java b/python4j/python4j-numpy/src/test/java/PythonNumpyImportTest.java
index 70a6ac7c6..d515cd64f 100644
--- a/python4j/python4j-numpy/src/test/java/PythonNumpyImportTest.java
+++ b/python4j/python4j-numpy/src/test/java/PythonNumpyImportTest.java
@@ -19,12 +19,14 @@
  */
 
 import org.nd4j.python4j.*;
-import org.junit.Assert;
+
 import org.junit.jupiter.api.Test;
 import org.nd4j.linalg.api.buffer.DataType;
 import org.nd4j.linalg.api.ndarray.INDArray;
 import org.nd4j.linalg.factory.Nd4j;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class PythonNumpyImportTest {
 
     @Test
@@ -34,7 +36,7 @@ public class PythonNumpyImportTest {
                 PythonObject np = Python.importModule("numpy");
                 PythonObject zeros = np.attr("zeros").call(5);
                 INDArray arr = NumpyArray.INSTANCE.toJava(zeros);
-                Assert.assertEquals(arr, Nd4j.zeros(DataType.DOUBLE, 5));
+                assertEquals(arr, Nd4j.zeros(DataType.DOUBLE, 5));
             }
         }
 
diff --git a/python4j/python4j-numpy/src/test/java/PythonNumpyMultiThreadTest.java b/python4j/python4j-numpy/src/test/java/PythonNumpyMultiThreadTest.java
index 3f64e8678..47f21f5ab 100644
--- a/python4j/python4j-numpy/src/test/java/PythonNumpyMultiThreadTest.java
+++ b/python4j/python4j-numpy/src/test/java/PythonNumpyMultiThreadTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.nd4j.python4j.*;
-import org.junit.Assert;
+
 import org.junit.jupiter.api.Test;
 
 import org.nd4j.linalg.api.buffer.DataType;
@@ -36,6 +36,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 
 @NotThreadSafe
 public class PythonNumpyMultiThreadTest {
@@ -73,7 +75,7 @@ public class PythonNumpyMultiThreadTest {
                     PythonVariable out = new PythonVariable<>("z", NumpyArray.INSTANCE);
                     String code = "z = x + y";
                     PythonExecutioner.exec(code, inputs, Collections.singletonList(out));
-                    Assert.assertEquals(Nd4j.ones(dataType, 2, 3).mul(7), out.getValue());
+                    assertEquals(Nd4j.ones(dataType, 2, 3).mul(7), out.getValue());
                 }
             } catch (Throwable e) {
                 exceptions.add(e);
@@ -114,9 +116,9 @@ public class PythonNumpyMultiThreadTest {
                         inputs.add(new PythonVariable<>("y", NumpyArray.INSTANCE, Nd4j.ones(dataType, 2, 3).mul(4)));
                         String code = "z = x + y";
                         List<PythonVariable> outputs = PythonExecutioner.execAndReturnAllVariables(code, inputs);
-                        Assert.assertEquals(Nd4j.ones(dataType, 2, 3).mul(3), outputs.get(0).getValue());
-                        Assert.assertEquals(Nd4j.ones(dataType, 2, 3).mul(4), outputs.get(1).getValue());
-                        Assert.assertEquals(Nd4j.ones(dataType, 2, 3).mul(7), outputs.get(2).getValue());
+                        assertEquals(Nd4j.ones(dataType, 2, 3).mul(3), outputs.get(0).getValue());
+                        assertEquals(Nd4j.ones(dataType, 2, 3).mul(4), outputs.get(1).getValue());
+                        assertEquals(Nd4j.ones(dataType, 2, 3).mul(7), outputs.get(2).getValue());
                     }
                 } catch (Throwable e) {
                     exceptions.add(e);
diff --git a/python4j/python4j-numpy/src/test/java/PythonNumpyServiceLoaderTest.java b/python4j/python4j-numpy/src/test/java/PythonNumpyServiceLoaderTest.java
index 5d39d27ae..23643a293 100644
--- a/python4j/python4j-numpy/src/test/java/PythonNumpyServiceLoaderTest.java
+++ b/python4j/python4j-numpy/src/test/java/PythonNumpyServiceLoaderTest.java
@@ -19,7 +19,7 @@
  */
 
 
-import org.junit.Assert;
+
 import org.junit.jupiter.api.Test;
 import org.nd4j.linalg.api.ndarray.INDArray;
 import org.nd4j.linalg.factory.Nd4j;
@@ -28,12 +28,14 @@ import org.nd4j.python4j.PythonTypes;
 
 import javax.annotation.concurrent.NotThreadSafe;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 @NotThreadSafe
 public class PythonNumpyServiceLoaderTest {
 
     @Test
     public void testServiceLoader(){
-        Assert.assertEquals(NumpyArray.INSTANCE, PythonTypes.<INDArray>get("numpy.ndarray"));
-        Assert.assertEquals(NumpyArray.INSTANCE, PythonTypes.getPythonTypeForJavaObject(Nd4j.zeros(1)));
+        assertEquals(NumpyArray.INSTANCE, PythonTypes.<INDArray>get("numpy.ndarray"));
+        assertEquals(NumpyArray.INSTANCE, PythonTypes.getPythonTypeForJavaObject(Nd4j.zeros(1)));
     }
 }
diff --git a/rl4j/pom.xml b/rl4j/pom.xml
index 8fd079262..3c3d247ea 100644
--- a/rl4j/pom.xml
+++ b/rl4j/pom.xml
@@ -101,7 +101,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
+                <inherited>true</inherited>
                 <configuration>
                     <argLine>-Ddtype=double  -Djava.library.path="${nd4j.basedir}/nd4j-backends/nd4j-backend-impls/nd4j-cuda/target/classes"</argLine>