diff --git a/cavis-dnn/cavis-dnn-common/build.gradle b/cavis-dnn/cavis-dnn-common/build.gradle
index e48cae638..4630d5ed5 100644
--- a/cavis-dnn/cavis-dnn-common/build.gradle
+++ b/cavis-dnn/cavis-dnn-common/build.gradle
@@ -16,4 +16,6 @@ dependencies {
     implementation 'org.apache.commons:commons-math3'
     implementation 'org.apache.commons:commons-lang3'
     implementation 'org.apache.commons:commons-compress'
-}
\ No newline at end of file
+
+    testRuntimeOnly 'net.brutex.ai:dl4j-test-resources:1.0.1-SNAPSHOT'
+}
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/datasets/TestDataSets.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/datasets/TestDataSets.java
index b6978c969..b14583d8c 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/datasets/TestDataSets.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/datasets/TestDataSets.java
@@ -27,11 +27,6 @@ import org.junit.jupiter.api.Test;
 
 public class TestDataSets extends BaseDL4JTest {
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 180000L;
-    }
-
     @Test
     public void testTinyImageNetExists() throws Exception {
         //Simple sanity check on extracting
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/datasets/fetchers/SvhnDataFetcherTest.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/datasets/fetchers/SvhnDataFetcherTest.java
index f85c1fdf6..a0b73489a 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/datasets/fetchers/SvhnDataFetcherTest.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/datasets/fetchers/SvhnDataFetcherTest.java
@@ -35,11 +35,6 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue;
  */
 public class SvhnDataFetcherTest extends BaseDL4JTest {
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 480_000_000L;    //Shouldn't take this long but slow download or drive access on CI machines may need extra time.
-    }
-
     @Test
     public void testSvhnDataFetcher() throws Exception {
         assumeTrue(isIntegrationTests());   //Ignore unless integration tests - CI can get caught up on slow disk access
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/datasets/iterator/DataSetIteratorTest.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/datasets/iterator/DataSetIteratorTest.java
index d4d0e28a1..138298e89 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/datasets/iterator/DataSetIteratorTest.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/datasets/iterator/DataSetIteratorTest.java
@@ -59,11 +59,6 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class DataSetIteratorTest extends BaseDL4JTest {
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 360000;  //Should run quickly; increased to large timeout due to occasonal slow CI downloads
-    }
-
     @Test
     public void testBatchSizeOfOneIris() throws Exception {
         //Test for (a) iterators returning correct number of examples, and
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/AttentionLayerTest.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/AttentionLayerTest.java
index f39be0929..739168b31 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/AttentionLayerTest.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/AttentionLayerTest.java
@@ -51,10 +51,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 ////@Ignore
 public class AttentionLayerTest extends BaseDL4JTest {
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 90000L;
-    }
 
     @Test
     public void testSelfAttentionLayer() {
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/BNGradientCheckTest.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/BNGradientCheckTest.java
index 6eb8c4e25..3d945b27e 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/BNGradientCheckTest.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/BNGradientCheckTest.java
@@ -62,11 +62,6 @@ public class BNGradientCheckTest extends BaseDL4JTest {
         Nd4j.setDataType(DataType.DOUBLE);
     }
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 90000L;
-    }
-
     @Test
     public void testGradient2dSimple() {
         DataNormalization scaler = new NormalizerMinMaxScaler();
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/CNN1DGradientCheckTest.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/CNN1DGradientCheckTest.java
index cdd11b6f9..094034320 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/CNN1DGradientCheckTest.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/CNN1DGradientCheckTest.java
@@ -62,11 +62,6 @@ public class CNN1DGradientCheckTest extends BaseDL4JTest {
         Nd4j.setDataType(DataType.DOUBLE);
     }
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 180000;
-    }
-
     @Test
     public void testCnn1DWithLocallyConnected1D() {
         Nd4j.getRandom().setSeed(1337);
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/CNN3DGradientCheckTest.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/CNN3DGradientCheckTest.java
index f7a9375f8..2c8f4dead 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/CNN3DGradientCheckTest.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/CNN3DGradientCheckTest.java
@@ -59,11 +59,6 @@ public class CNN3DGradientCheckTest extends BaseDL4JTest {
         Nd4j.setDataType(DataType.DOUBLE);
     }
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 90000L;
-    }
-
     @Test
     public void testCnn3DPlain() {
         Nd4j.getRandom().setSeed(1337);
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/CNNGradientCheckTest.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/CNNGradientCheckTest.java
index b3a9e1020..3772741d5 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/CNNGradientCheckTest.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/CNNGradientCheckTest.java
@@ -73,11 +73,6 @@ public class CNNGradientCheckTest extends BaseDL4JTest {
         return CNN2DFormat.values();
     }
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 999990000L;
-    }
-
     @Test
     public void testGradientCNNMLN() {
         if(this.format != CNN2DFormat.NCHW) //Only test NCHW due to flat input format...
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/CapsnetGradientCheckTest.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/CapsnetGradientCheckTest.java
index acdd9be27..c0a6cad8e 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/CapsnetGradientCheckTest.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/CapsnetGradientCheckTest.java
@@ -49,11 +49,6 @@ import java.util.Random;
 ////@Ignore
 public class CapsnetGradientCheckTest extends BaseDL4JTest {
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 90000L;
-    }
-
     @Test
     public void testCapsNet() {
 
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/DropoutGradientCheck.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/DropoutGradientCheck.java
index 7ca1064b3..193ede7ac 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/DropoutGradientCheck.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/DropoutGradientCheck.java
@@ -59,11 +59,6 @@ public class DropoutGradientCheck extends BaseDL4JTest {
         Nd4j.setDataType(DataType.DOUBLE);
     }
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 90000L;
-    }
-
     @Test
     public void testDropoutGradient() {
         int minibatch = 3;
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/GlobalPoolingGradientCheckTests.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/GlobalPoolingGradientCheckTests.java
index 214cb895e..f4b9d4dc5 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/GlobalPoolingGradientCheckTests.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/GlobalPoolingGradientCheckTests.java
@@ -55,11 +55,6 @@ public class GlobalPoolingGradientCheckTests extends BaseDL4JTest {
     private static final double DEFAULT_MAX_REL_ERROR = 1e-3;
     private static final double DEFAULT_MIN_ABS_ERROR = 1e-8;
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 90000L;
-    }
-
     @Test
     public void testRNNGlobalPoolingBasicMultiLayer() {
         //Basic test of global pooling w/ LSTM
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/GradientCheckTests.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/GradientCheckTests.java
index 17c43c5c0..cab80a69a 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/GradientCheckTests.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/GradientCheckTests.java
@@ -70,11 +70,6 @@ public class GradientCheckTests extends BaseDL4JTest {
         Nd4j.setDataType(DataType.DOUBLE);
     }
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 90000L;
-    }
-
     @Test
     public void testMinibatchApplication() {
         IrisDataSetIterator iter = new IrisDataSetIterator(30, 150);
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/GradientCheckTestsComputationGraph.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/GradientCheckTestsComputationGraph.java
index bd18f698b..be641898e 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/GradientCheckTestsComputationGraph.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/GradientCheckTestsComputationGraph.java
@@ -71,11 +71,6 @@ public class GradientCheckTestsComputationGraph extends BaseDL4JTest {
         Nd4j.setDataType(DataType.DOUBLE);
     }
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 999999999L;
-    }
-
     @Test
     public void testBasicIris() {
         Nd4j.getRandom().setSeed(12345);
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/GradientCheckTestsMasking.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/GradientCheckTestsMasking.java
index b5822bc3d..a444e1146 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/GradientCheckTestsMasking.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/GradientCheckTestsMasking.java
@@ -59,11 +59,6 @@ public class GradientCheckTestsMasking extends BaseDL4JTest {
         Nd4j.setDataType(DataType.DOUBLE);
     }
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 90000L;
-    }
-
     private static class GradientCheckSimpleScenario {
         private final ILossFunction lf;
         private final Activation act;
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/LRNGradientCheckTests.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/LRNGradientCheckTests.java
index 3ab2efd59..ad1b564db 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/LRNGradientCheckTests.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/LRNGradientCheckTests.java
@@ -54,12 +54,6 @@ public class LRNGradientCheckTests extends BaseDL4JTest {
         Nd4j.setDataType(DataType.DOUBLE);
     }
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 90000L;
-    }
-
-
     @Test
     public void testGradientLRNSimple() {
         Nd4j.getRandom().setSeed(12345);
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/LSTMGradientCheckTests.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/LSTMGradientCheckTests.java
index 00fef6150..452742f10 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/LSTMGradientCheckTests.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/LSTMGradientCheckTests.java
@@ -55,11 +55,6 @@ public class LSTMGradientCheckTests extends BaseDL4JTest {
         Nd4j.setDataType(DataType.DOUBLE);
     }
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 90000L;
-    }
-
     @Test
     public void testLSTMBasicMultiLayer() {
         //Basic test of GravesLSTM layer
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/LossFunctionGradientCheck.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/LossFunctionGradientCheck.java
index bc85841e3..fe4c1eb3b 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/LossFunctionGradientCheck.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/LossFunctionGradientCheck.java
@@ -73,11 +73,6 @@ public class LossFunctionGradientCheck extends BaseDL4JTest {
     private static final double DEFAULT_MAX_REL_ERROR = 1e-5;
     private static final double DEFAULT_MIN_ABS_ERROR = 1e-8;
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 90000L;
-    }
-
     @Test
     public void lossFunctionGradientCheck() {
         ILossFunction[] lossFunctions = new ILossFunction[] {new LossBinaryXENT(), new LossBinaryXENT(),
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/NoBiasGradientCheckTests.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/NoBiasGradientCheckTests.java
index c9e65579b..8acbf157e 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/NoBiasGradientCheckTests.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/NoBiasGradientCheckTests.java
@@ -52,11 +52,6 @@ public class NoBiasGradientCheckTests extends BaseDL4JTest {
         Nd4j.setDataType(DataType.DOUBLE);
     }
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 90000L;
-    }
-
     @Test
     public void testGradientNoBiasDenseOutput() {
 
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/OutputLayerGradientChecks.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/OutputLayerGradientChecks.java
index 12a1340e2..f11daf9ec 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/OutputLayerGradientChecks.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/OutputLayerGradientChecks.java
@@ -52,11 +52,6 @@ public class OutputLayerGradientChecks extends BaseDL4JTest {
         Nd4j.setDataType(DataType.DOUBLE);
     }
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 90000L;
-    }
-
     @Test
     public void testRnnLossLayer() {
         Nd4j.getRandom().setSeed(12345L);
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/RnnGradientChecks.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/RnnGradientChecks.java
index d1cbd5955..4555904ca 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/RnnGradientChecks.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/RnnGradientChecks.java
@@ -55,11 +55,6 @@ public class RnnGradientChecks extends BaseDL4JTest {
         Nd4j.setDataType(DataType.DOUBLE);
     }
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 90000L;
-    }
-
     @Test
     ////@Ignore("AB 2019/06/24 - Ignored to get to all passing baseline to prevent regressions via CI - see issue #7912")
     public void testBidirectionalWrapper() {
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/UtilLayerGradientChecks.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/UtilLayerGradientChecks.java
index 25d594d9a..670987c78 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/UtilLayerGradientChecks.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/UtilLayerGradientChecks.java
@@ -56,11 +56,6 @@ public class UtilLayerGradientChecks extends BaseDL4JTest {
         Nd4j.setDataType(DataType.DOUBLE);
     }
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 90000L;
-    }
-
     @Test
     public void testMaskLayer() {
         Nd4j.getRandom().setSeed(12345);
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/VaeGradientCheckTests.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/VaeGradientCheckTests.java
index ec9fdab25..92ddf8622 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/VaeGradientCheckTests.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/VaeGradientCheckTests.java
@@ -57,11 +57,6 @@ public class VaeGradientCheckTests extends BaseDL4JTest {
         Nd4j.setDataType(DataType.DOUBLE);
     }
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 90000L;
-    }
-
     @Test
     public void testVaeAsMLP() {
         //Post pre-training: a VAE can be used as a MLP, by taking the mean value from p(z|x) as the output
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/YoloGradientCheckTests.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/YoloGradientCheckTests.java
index 85e513076..105fcb284 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/YoloGradientCheckTests.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/gradientcheck/YoloGradientCheckTests.java
@@ -72,11 +72,6 @@ public class YoloGradientCheckTests extends BaseDL4JTest {
     @TempDir
     public File testDir;
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 90000L;
-    }
-
     @Test
     public void testYoloOutputLayer() {
         int depthIn = 2;
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/nn/dtypes/DTypeTests.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/nn/dtypes/DTypeTests.java
index 039c3e4e6..b3e625849 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/nn/dtypes/DTypeTests.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/nn/dtypes/DTypeTests.java
@@ -186,11 +186,6 @@ public class DTypeTests extends BaseDL4JTest {
             TensorFlowCnnToFeedForwardPreProcessor.class    //Deprecated
     ));
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 9999999L;
-    }
-
     @AfterAll
     public static void after() {
         ImmutableSet<ClassPath.ClassInfo> info;
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/nn/layers/normalization/BatchNormalizationTest.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/nn/layers/normalization/BatchNormalizationTest.java
index e50868b7a..10ca617fe 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/nn/layers/normalization/BatchNormalizationTest.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/nn/layers/normalization/BatchNormalizationTest.java
@@ -93,11 +93,6 @@ public class BatchNormalizationTest extends BaseDL4JTest {
     public void doBefore() {
     }
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 90000L;
-    }
-
     @Test
     public void testDnnForwardPass() {
         int nOut = 10;
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTest.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTest.java
index e10f3180b..c8e758feb 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTest.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/nn/multilayer/MultiLayerTest.java
@@ -21,6 +21,7 @@
 package org.deeplearning4j.nn.multilayer;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.deeplearning4j.BaseDL4JTest;
 import org.deeplearning4j.TestUtils;
@@ -1424,6 +1425,7 @@ public class MultiLayerTest extends BaseDL4JTest {
     }
 
     @Data
+    @EqualsAndHashCode(callSuper = false)
     public static class CheckModelsListener extends BaseTrainingListener {
 
         private Set<Class<?>> modelClasses = new HashSet<>();
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/optimize/solver/accumulation/EncodedGradientsAccumulatorTest.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/optimize/solver/accumulation/EncodedGradientsAccumulatorTest.java
index 44ce85710..23347d950 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/optimize/solver/accumulation/EncodedGradientsAccumulatorTest.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/optimize/solver/accumulation/EncodedGradientsAccumulatorTest.java
@@ -39,11 +39,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 @Slf4j
 public class EncodedGradientsAccumulatorTest extends BaseDL4JTest {
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 1200000L;
-    }
-
     /**
      * This test ensures, that memory amount assigned to buffer is enough for any number of updates
      * @throws Exception
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/optimizer/listener/TestCheckpointListener.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/optimizer/listener/TestCheckpointListener.java
index 9b94b1b2c..4c3760d95 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/optimizer/listener/TestCheckpointListener.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/optimizer/listener/TestCheckpointListener.java
@@ -47,11 +47,6 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class TestCheckpointListener extends BaseDL4JTest {
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 90000L;
-    }
-
     @TempDir
     public File tempDir;
 
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/optimizer/listener/TestListeners.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/optimizer/listener/TestListeners.java
index 48e610dfb..47430c8c3 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/optimizer/listener/TestListeners.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/optimizer/listener/TestListeners.java
@@ -67,11 +67,6 @@ public class TestListeners extends BaseDL4JTest {
     @TempDir
     public File tempDir;
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 90000L;
-    }
-
     @Test
     public void testSettingListenersUnsupervised() {
         //Pretrain layers should get copies of the listeners, in addition to the
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest060.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest060.java
index da6976b6a..985f347d8 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest060.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest060.java
@@ -60,11 +60,6 @@ public class RegressionTest060 extends BaseDL4JTest {
         return DataType.FLOAT;
     }
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 180000L;  //Most tests should be fast, but slow download may cause timeout on slow connections
-    }
-
     @Test
     public void regressionTestMLP1() throws Exception {
 
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest071.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest071.java
index e2ef4b233..2a75e7994 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest071.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest071.java
@@ -61,11 +61,6 @@ public class RegressionTest071 extends BaseDL4JTest {
         return DataType.FLOAT;
     }
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 180000L;  //Most tests should be fast, but slow download may cause timeout on slow connections
-    }
-
     @Test
     public void regressionTestMLP1() throws Exception {
 
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest080.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest080.java
index b2af73f06..6566f03fe 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest080.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest080.java
@@ -60,11 +60,6 @@ public class RegressionTest080 extends BaseDL4JTest {
         return DataType.FLOAT;
     }
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 180000L;  //Most tests should be fast, but slow download may cause timeout on slow connections
-    }
-
     @Test
     public void regressionTestMLP1() throws Exception {
 
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100a.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100a.java
index d2b20bea3..acee54871 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100a.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100a.java
@@ -57,11 +57,6 @@ import static org.junit.jupiter.api.Assertions.*;
 @Slf4j
 public class RegressionTest100a extends BaseDL4JTest {
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 180000L;  //Most tests should be fast, but slow download may cause timeout on slow connections
-    }
-
     @Override
     public DataType getDataType(){
         return DataType.FLOAT;
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b3.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b3.java
index 8cca8472e..8df2f258b 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b3.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b3.java
@@ -54,11 +54,6 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class RegressionTest100b3 extends BaseDL4JTest {
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 180000L;  //Most tests should be fast, but slow download may cause timeout on slow connections
-    }
-
     @Override
     public DataType getDataType(){
         return DataType.FLOAT;
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b4.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b4.java
index 71c928d84..5b4270a4e 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b4.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b4.java
@@ -73,11 +73,6 @@ import org.nd4j.common.resources.Resources;
 
 public class RegressionTest100b4 extends BaseDL4JTest {
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 180000L;  //Most tests should be fast, but slow download may cause timeout on slow connections
-    }
-
     @Override
     public DataType getDataType() {
         return DataType.FLOAT;
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b6.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b6.java
index cbf45e56d..40df45924 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b6.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b6.java
@@ -60,11 +60,6 @@ public class RegressionTest100b6 extends BaseDL4JTest {
         return DataType.FLOAT;
     }
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 180000L;  //Most tests should be fast, but slow download may cause timeout on slow connections
-    }
-
     @Test
     public void testCustomLayer() throws Exception {
 
diff --git a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/TestDistributionDeserializer.java b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/TestDistributionDeserializer.java
index 9d66e9b5a..8ec311167 100644
--- a/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/TestDistributionDeserializer.java
+++ b/cavis-dnn/cavis-dnn-core/src/test/java/org/deeplearning4j/regressiontest/TestDistributionDeserializer.java
@@ -31,11 +31,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TestDistributionDeserializer extends BaseDL4JTest {
 
-    @Override
-    public long getTimeoutMilliseconds() {
-        return 180000L;  //Most tests should be fast, but slow download may cause timeout on slow connections
-    }
-
     @Test
     public void testDistributionDeserializer() throws Exception {
         //Test current format:
diff --git a/cavis-native/cavis-native-cpu/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuNDArrayFactory.java b/cavis-native/cavis-native-cpu/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuNDArrayFactory.java
index 7de40dbdb..668b4e25b 100644
--- a/cavis-native/cavis-native-cpu/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuNDArrayFactory.java
+++ b/cavis-native/cavis-native-cpu/src/main/java/org/nd4j/linalg/cpu/nativecpu/CpuNDArrayFactory.java
@@ -21,6 +21,7 @@
 package org.nd4j.linalg.cpu.nativecpu;
 
 
+import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.nd4j.common.base.Preconditions;
@@ -578,8 +579,8 @@ public class CpuNDArrayFactory extends BaseNativeNDArrayFactory {
      * @return the concatenate ndarrays
      */
     @Override
-    public INDArray concat(int dimension, INDArray... toConcat) {
-        if (toConcat == null || toConcat.length == 0)
+    public INDArray concat(int dimension, @NonNull INDArray... toConcat) {
+        if (toConcat.length == 0)
             throw new ND4JIllegalStateException("Can't concatenate 0 arrays");
 
         if (toConcat.length == 1)