diff --git a/fare-utils.asd b/fare-utils.asd
index 7006beaf04a0aaf41229ec72b050e066810b3947..2804e7bb5d0aa1c42a92d351cfaa7c37ddb04aad 100644
--- a/fare-utils.asd
+++ b/fare-utils.asd
@@ -65,9 +65,9 @@
     ((:file "package")
      (:file "map" :depends-on ("package"))
      (:file "alist" :depends-on ("map"))
-     (:file "tree" :depends-on ("map"))
-     (:file "hash-table" :depends-on ("tree" "alist"))
-     (:file "fmim" :depends-on ("map" "tree" "alist"))))
+     (:file "tree" :depends-on ("map" "alist"))
+     (:file "hash-table" :depends-on ("tree"))
+     (:file "fmim" :depends-on ("map" "tree"))))
    
    ;;; Stateful containers
    (:module "stateful"
diff --git a/test/functional-map.lisp b/test/functional-map.lisp
index fadc059054dd1f1b350c8aae3f2a4d3cd2996f72..b276e42bbbf90b714f29a6d7d64e28d34645f901 100644
--- a/test/functional-map.lisp
+++ b/test/functional-map.lisp
@@ -67,7 +67,8 @@
   ;; insert and join
   (is (equal-alist
        '((0 . "0") (1 . "1") (2 . "2"))
-       (alist-from i (insert i (from-alist i (join i '((1 . "1")) '((2 . "2")))) 0 "0"))))
+       (alist-from i (insert i (join i (from-alist i '((1 . "1")))
+                                     (from-alist i'((2 . "2")))) 0 "0"))))
   ;; insert and size
   (is (= 101 (size i (insert i (from-alist i *al-1*) 101 "101"))))
 
@@ -86,7 +87,7 @@
   ;; drop and size
   (multiple-value-bind (r d b)
       (drop i (from-alist i *alist-100-decimal*) 57)
-    (is (= (length r) 99))
+    (is (= (size i r) 99))
     (is (equal d "57"))
     (is (eql b t)))
 
@@ -114,7 +115,7 @@
                (multiple-value-list (lookup <alist> *alist-10-latin* k))))
     (is (equal (list nil nil)
                (multiple-value-list (lookup i m k))))
-    (is (= (length m) 9)))
+    (is (= (size i m) 9)))
 
   ;; fold-left
   (is (eql nil (fold-left i (empty i) (constantly t) nil)))
@@ -129,10 +130,9 @@
   ;; fold-left and size
   (is (= 100
          (size i
-               (from-alist i
-                           (fold-left i (from-alist i *alist-100-decimal*)
-                                      (lambda (m k v) (insert i m k v))
-                                      (from-alist i *alist-100-latin*))))))
+               (fold-left i (from-alist i *alist-100-decimal*)
+                          (lambda (m k v) (insert i m k v))
+                          (from-alist i *alist-100-latin*)))))
 
   ;; fold-right
   (is (eql nil (fold-right i (empty i) (constantly t) nil)))