diff --git a/buildall.sh b/buildall.sh
index 052bfdc..d17fd8a 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -191,7 +191,7 @@ do
       exit 1
     fi
 
-      lein test
+    lein test
     if [ $? -ne 0 ]
     then
       echo "Sub-project ${dir} failed in test" 1>&2
diff --git a/project.clj b/project.clj
index c55b8d5..e7c165c 100644
--- a/project.clj
+++ b/project.clj
@@ -15,7 +15,6 @@
   :dependencies [[org.clojure/clojure "1.8.0"]
                  [org.clojure/math.combinatorics "0.1.4"]
                  [org.clojure/tools.trace "0.7.9"]
-                 [org.clojure/tools.namespace "0.2.10"]
+                 [org.clojure/tools.namespace "0.2.11"]
                  [hiccup "1.0.5"]
-                 [net.mikera/imagez "0.12.0"]
-                 [fivetonine/collage "0.2.0"]])
+                 [net.mikera/imagez "0.12.0"]])
diff --git a/src/mw_engine/heightmap.clj b/src/mw_engine/heightmap.clj
index eaa3e2b..3ef8e3c 100644
--- a/src/mw_engine/heightmap.clj
+++ b/src/mw_engine/heightmap.clj
@@ -2,8 +2,7 @@
       :author "Simon Brooke"}
   mw-engine.heightmap
   (:import [java.awt.image BufferedImage])
-  (:require [fivetonine.collage.util :as collage :only [load-image]]
-            [mikera.image.core :as imagez :only [filter-image get-pixels]]
+  (:require [mikera.image.core :as imagez :only [filter-image get-pixels]]
             [mikera.image.filters :as filters]
             [mw-engine.utils :refer [abs get-int get-neighbours map-world]]
             [mw-engine.world :refer [make-world]]))
@@ -107,14 +106,14 @@
   * `imagepath` a file path or URL which indicates an (ideally greyscale) image file."
   ([world imagepath]
     (let [heightmap (imagez/filter-image
-                      (imagez/load-image-resource imagepath)
+                      (imagez/load-image imagepath)
                       (filters/grayscale))]
       (map-world
         (map-world world tag-altitude (list heightmap))
         tag-gradient)))
    ([imagepath]
     (let [heightmap (imagez/filter-image
-                      (imagez/load-image-resource imagepath)
+                      (imagez/load-image imagepath)
                       (filters/grayscale))
           world (make-world (.getWidth heightmap) (.getHeight heightmap))]
       (map-world
@@ -132,6 +131,6 @@
       intensity of the corresponding cell of the image."
   [world imagepath property]
     (let [heightmap (imagez/filter-image
-                      (imagez/load-image-resource imagepath)
+                      (imagez/load-image imagepath)
                       (filters/grayscale))]
       (map-world world tag-property (list property heightmap))))
diff --git a/src/mw_engine/utils.clj b/src/mw_engine/utils.clj
index fb39003..53c359f 100644
--- a/src/mw_engine/utils.clj
+++ b/src/mw_engine/utils.clj
@@ -112,7 +112,7 @@
   ([world function additional-args]
     (into []
            (pmap (fn [row]
-                    (into [] (mapv
+                    (into [] (map
                              #(apply function
                                      (cons world (cons % additional-args)))
                              row)))
diff --git a/test/mw_engine/heightmap_test.clj b/test/mw_engine/heightmap_test.clj
index 2d96722..66207a4 100644
--- a/test/mw_engine/heightmap_test.clj
+++ b/test/mw_engine/heightmap_test.clj
@@ -7,7 +7,7 @@
 
 (deftest apply-heightmap-test
   (testing "Heightmap functionality"
-           (let [world (apply-heightmap "heightmaps/test9x9.png")
+           (let [world (apply-heightmap "resources/heightmaps/test9x9.png")
                  altitudes (map #(:altitude %) (flatten world))
                  gradients (map #(:gradient %) (flatten world))]
              (is (= (count world) 9) "World should be 9x9")
@@ -22,7 +22,7 @@
              (is (> (apply + gradients) 0)
                  "At least some gradients must be positive, none should be negative"))
            ;; alternate means of making the world, same tests.
-           (let [world (apply-heightmap (world/make-world 9 9) "heightmaps/test9x9.png")
+           (let [world (apply-heightmap (world/make-world 9 9) "resources/heightmaps/test9x9.png")
                  altitudes (map #(:altitude %) (flatten world))
                  gradients (map #(:gradient %) (flatten world))]
              (is (= (count world) 9) "World should be 9x9")
@@ -42,7 +42,7 @@
 
 (deftest apply-valuemap-test
   (testing "Valuemap functionality"
-    (let [image "heightmaps/test9x9.png"
+    (let [image "resources/heightmaps/test9x9.png"
           world (apply-valuemap (apply-heightmap image) image :arbitrary)
           altitudes (map #(:altitude %) (flatten world))
           arbitraries (map #(:arbitrary %) (flatten world))]