diff --git a/nd4s/pom.xml b/nd4s/pom.xml
index 7fc3fb7d3..f165cfae9 100644
--- a/nd4s/pom.xml
+++ b/nd4s/pom.xml
@@ -294,7 +294,7 @@
 
     <profiles>
         <profile>
-            <id>nd4j-tests-cpu</id>
+            <id>test-nd4j-native</id>
             <dependencies>
                 <dependency>
                     <groupId>org.nd4j</groupId>
@@ -302,11 +302,17 @@
                     <version>${project.version}</version>
                     <scope>test</scope>
                 </dependency>
+                <dependency>
+                    <groupId>org.deeplearning4j</groupId>
+                    <artifactId>dl4j-test-resources</artifactId>
+                    <version>${dl4j-test-resources.version}</version>
+                    <scope>test</scope>
+                </dependency>
             </dependencies>
         </profile>
 
         <profile>
-            <id>nd4j-tests-cuda</id>
+            <id>test-nd4j-cuda-10.1</id>
             <dependencies>
                 <dependency>
                     <groupId>org.nd4j</groupId>
@@ -314,6 +320,12 @@
                     <version>${project.version}</version>
                     <scope>test</scope>
                 </dependency>
+                <dependency>
+                    <groupId>org.deeplearning4j</groupId>
+                    <artifactId>dl4j-test-resources</artifactId>
+                    <version>${dl4j-test-resources.version}</version>
+                    <scope>test</scope>
+                </dependency>
             </dependencies>
         </profile>
     </profiles>
diff --git a/nd4s/src/main/scala/org/nd4s/CollectionLikeNDArray.scala b/nd4s/src/main/scala/org/nd4s/CollectionLikeNDArray.scala
index e6818fbc0..bdbe43bc3 100644
--- a/nd4s/src/main/scala/org/nd4s/CollectionLikeNDArray.scala
+++ b/nd4s/src/main/scala/org/nd4s/CollectionLikeNDArray.scala
@@ -64,7 +64,7 @@ trait CollectionLikeNDArray[A <: INDArray] {
     val lv = ev.linearView(underlying)
     breakable {
       for {
-        i <- 0 until lv.length().toInt 
+        i <- 0 until lv.length().toInt
       } if (!f(ev.get(lv, i))) {
         result = true
         break()
@@ -80,7 +80,7 @@ trait CollectionLikeNDArray[A <: INDArray] {
     val lv = ev.linearView(underlying)
     breakable {
       for {
-        i <- 0 until lv.length().toInt 
+        i <- 0 until lv.length().toInt
       } if (!f(ev.get(lv, i))) {
         result = false
         break()
diff --git a/nd4s/src/test/scala/org/nd4s/samediff/SameDiffTest.scala b/nd4s/src/test/scala/org/nd4s/samediff/SameDiffTest.scala
index 2f5746b95..d0efee304 100644
--- a/nd4s/src/test/scala/org/nd4s/samediff/SameDiffTest.scala
+++ b/nd4s/src/test/scala/org/nd4s/samediff/SameDiffTest.scala
@@ -4,7 +4,7 @@ import java.lang.reflect.Field
 import java.util
 import java.util.{ Arrays, Collections, HashMap, List, Map }
 
-import com.google.common.collect.{ Lists, Maps }
+import org.nd4j.shade.guava.collect.{ Lists, Maps }
 import org.junit.Assert._
 import org.junit.Assume.assumeNotNull
 import org.nd4j.autodiff.samediff._