   (testing "get-units"
     (is (= 20 (count (unit/get-units))))))
 
-(comment
 (defn- test-unit
   [name code]
-  (let [unit (get-unit-by-name name)
-        unit-by-code (get-unit-by-code code)]
+  (let [unit (unit/get-unit-by-name name)
+        unit-by-code (unit/get-unit-by-code code)]
     (is (= unit unit-by-code))
-    (is (= name (unit-name unit)))
-    (is (= code (unit-code unit)))
-    (is (> (unit-attack unit) 0))
-    (is (unit-movement-type unit))
-    (is (> (unit-defense unit) 0))))
+    (is (= name (unit/unit-name unit)))
+    (is (= code (unit/unit-code unit)))
+    (is (> (unit/unit-attack unit) 0))
+    (is (unit/unit-movement-type unit))
+    (is (> (unit/unit-defense unit) 0))))
 
 (defn- verify-unit
   [unit]
   (testing  (test-unit (:name unit) (:code unit))))
 
 (deftest verify-units
-  (doseq [unit (get-units)]
+  (doseq [unit (unit/get-units)]
     (verify-unit unit)))
 
 (defn- unit-present?
   "Checks if a unit is present"
   [uname coll]
-  (some (fn [u] (= (unit-name u) (name uname))) coll))
+  (some (fn [u] (= (unit/unit-name u) (name uname))) coll))
 
 (deftest units-by-category-test
   (testing "light units"
-    (let [units (units-by-category :light)]
+    (let [units (unit/units-by-category :light)]
       (is units)
       (is (> (count units) 0))
       (is (unit-present? :rain units))

      (is (not (unit-present? :worm units))))))

(verify-units)
)

      (is (not (unit-present? :crusader units)))))

  (testing "heavy units"
    (let [units (unit/units-by-category :heavy)]
      (is units)
      (is (> (count units) 0))
      (is (unit-present? :crusader units))
