diff --git a/ansi-tests/assoc-if-not.lsp b/ansi-tests/assoc-if-not.lsp
index cb7e16998c40a6aed54b601333e3170f10644a22..192354e1582f0368ba267f325839a6224e0de11e 100644
--- a/ansi-tests/assoc-if-not.lsp
+++ b/ansi-tests/assoc-if-not.lsp
@@ -119,7 +119,7 @@
       (assoc-if-not #'evenp alist :key (expand-in-current-env (%m '1+)))
       )))
   (4 . c)
-  (4 . c))      
+  (4 . c))
       
 ;;; Error tests
 
diff --git a/ansi-tests/assoc-if.lsp b/ansi-tests/assoc-if.lsp
index 249336e273897f421cb6f8db857d69c8171be60d..0e00f63939224c77ea596fbd892cf5486eba7808 100644
--- a/ansi-tests/assoc-if.lsp
+++ b/ansi-tests/assoc-if.lsp
@@ -99,6 +99,25 @@
   (assoc-if #'null '((a . 1) (nil . 2) (c . 3)) :key nil :key #'null)
   (nil . 2))
 
+;;; Macro env tests
+
+(deftest assoc-if.env.1
+  (macrolet
+   ((%m (z) z))
+   (let ((alist '((1 . a) (3 . b) (6 . c) (8 . d) (-1 . e))))
+     (values
+      (assoc-if (expand-in-current-env (%m 'evenp)) alist)
+      (assoc-if (expand-in-current-env (%m #'evenp)) alist)
+      (assoc-if #'evenp (expand-in-current-env (%m alist)))
+      (assoc-if 'oddp alist (expand-in-current-env (%m :key)) '1+)
+      (assoc-if 'oddp alist :key (expand-in-current-env (%m #'1+)))
+      )))
+  (6 . c)
+  (6 . c)
+  (6 . c)
+  (6 . c)
+  (6 . c))      
+
 ;;; Error cases
 
 (deftest assoc-if.error.1
diff --git a/ansi-tests/atan.lsp b/ansi-tests/atan.lsp
index 54c77b0aaa740ad915cde5e8fd08dafddd22a6fc..50b55b1c33f3f9df887fa617ca3bfbd338dfbca3 100644
--- a/ansi-tests/atan.lsp
+++ b/ansi-tests/atan.lsp
@@ -119,6 +119,10 @@
 	collect (approx= (atan (coerce -1 type)) (coerce (/ pi -4) type)))
   (t t t t))
 
+(deftest atan.14
+  (macrolet ((%m (z) z)) (atan (expand-in-current-env (%m 0.0))))
+  0.0)
+
 ;;; FIXME
 ;;; More accuracy tests here
 
diff --git a/ansi-tests/atanh.lsp b/ansi-tests/atanh.lsp
index 1d4adffeff7dc36f2ec3e056357b7460598de0d2..94e883a3f34bc1cdabc7114b6c0eeb32df6d453e 100644
--- a/ansi-tests/atanh.lsp
+++ b/ansi-tests/atanh.lsp
@@ -93,6 +93,9 @@
 	 collect (list x1 rlist)))
   nil)
 
+(deftest atanh.8
+  (macrolet ((%m (z) z)) (atanh (expand-in-current-env (%m 0.0))))
+  0.0)
 
 
 ;;; FIXME
diff --git a/ansi-tests/atom.lsp b/ansi-tests/atom.lsp
index b9905c6bbed9c7d914992bec1cc3c10542157220..2cc53b19c9a22e3ecfa4fc470dab7e6a798888c5 100644
--- a/ansi-tests/atom.lsp
+++ b/ansi-tests/atom.lsp
@@ -7,6 +7,16 @@
 
 ; (compile-and-load "cons-aux.lsp")
 
+(deftest atom.1
+  (loop for x in *universe*
+	unless (if (atom x) (not (consp x)) (consp x))
+	collect x)
+  nil)
+
+(deftest atom.2
+  (macrolet ((%m (z) z)) (atom (expand-in-current-env (%m 0))))
+  t)
+
 (deftest atom.order.1
   (let ((i 0))
     (values (atom (progn (incf i) '(a b))) i))