diff --git a/arrays/bit-and.lsp b/arrays/bit-and.lsp
index d4c5fb629878652571f713ccb9b1a0a85b9ab718..693c9b1846c62a489706f6246c1c48283cd5b59d 100644
--- a/arrays/bit-and.lsp
+++ b/arrays/bit-and.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "bit-aux.lsp")
+
 
 (deftest bit-and.1
   (let* ((s1 (make-array nil :initial-element 0 :element-type 'bit))
diff --git a/arrays/bit-andc1.lsp b/arrays/bit-andc1.lsp
index 3997a88b5f8ad0af201fe2ee701333e68ded2d07..24a521a8de623eec856ddcf3998bdbdc66c87abd 100644
--- a/arrays/bit-andc1.lsp
+++ b/arrays/bit-andc1.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "bit-aux.lsp")
+
 
 (deftest bit-andc1.1
   (let* ((s1 (make-array nil :initial-element 0 :element-type 'bit))
diff --git a/arrays/bit-andc2.lsp b/arrays/bit-andc2.lsp
index 9a20b7ec299a8a47f20a869778f6a4fd6d7765e7..8138657af89db2ea2d0e6da267a5ec777f13bc9e 100644
--- a/arrays/bit-andc2.lsp
+++ b/arrays/bit-andc2.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "bit-aux.lsp")
+
 
 (deftest bit-andc2.1
   (let* ((s1 (make-array nil :initial-element 0 :element-type 'bit))
diff --git a/arrays/bit-eqv.lsp b/arrays/bit-eqv.lsp
index 5fdfb32972ee4b1bf10589bf4442cf49406b8270..abbc830aadbbb1eb0ca2c5a3e8e6d29402611670 100644
--- a/arrays/bit-eqv.lsp
+++ b/arrays/bit-eqv.lsp
@@ -6,7 +6,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "bit-aux.lsp")
+
 
 (deftest bit-eqv.1
   (let* ((s1 (make-array nil :initial-element 0 :element-type 'bit))
diff --git a/arrays/bit-ior.lsp b/arrays/bit-ior.lsp
index bad18647a0aec196613f21deaab0ad73929847f3..d231ccde79ec9a3182ed434e302311d8a670a5e8 100644
--- a/arrays/bit-ior.lsp
+++ b/arrays/bit-ior.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "bit-aux.lsp")
+
 
 (deftest bit-ior.1
   (let* ((s1 (make-array nil :initial-element 0 :element-type 'bit))
diff --git a/arrays/bit-nand.lsp b/arrays/bit-nand.lsp
index 2cc973295d94cb4e7cd0e0be9b945017ad992ba6..d5dd884dc028fde5f17995ecc5b274ba9dcf71e6 100644
--- a/arrays/bit-nand.lsp
+++ b/arrays/bit-nand.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "bit-aux.lsp")
+
 
 (deftest bit-nand.1
   (let* ((s1 (make-array nil :initial-element 0 :element-type 'bit))
diff --git a/arrays/bit-nor.lsp b/arrays/bit-nor.lsp
index cc9a0d76d89cab3eb17aa4f7a07a5a20e74bcb6f..d4e3886d9a717b99338651d18bd3533e02533b06 100644
--- a/arrays/bit-nor.lsp
+++ b/arrays/bit-nor.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "bit-aux.lsp")
+
 
 (deftest bit-nor.1
   (let* ((s1 (make-array nil :initial-element 0 :element-type 'bit))
diff --git a/arrays/bit-orc1.lsp b/arrays/bit-orc1.lsp
index fddac4738728ac326ccedd15dae1a98d299f9cfd..dca631c8c1bda852974f78286188f50bc31725e5 100644
--- a/arrays/bit-orc1.lsp
+++ b/arrays/bit-orc1.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "bit-aux.lsp")
+
 
 (deftest bit-orc1.1
   (let* ((s1 (make-array nil :initial-element 0 :element-type 'bit))
diff --git a/arrays/bit-orc2.lsp b/arrays/bit-orc2.lsp
index aaec562ec6b066ddcc16bc9a4a84fa31e6d36157..26801c72e879d04de58d510b0929e22272374065 100644
--- a/arrays/bit-orc2.lsp
+++ b/arrays/bit-orc2.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "bit-aux.lsp")
+
 
 (deftest bit-orc2.1
   (let* ((s1 (make-array nil :initial-element 0 :element-type 'bit))
diff --git a/arrays/bit-xor.lsp b/arrays/bit-xor.lsp
index 0f629cfaf7f90b05ae216e4f22560cdcc4c102ee..1360bf27ee37ee5c2d94a85a41adb50b0686fc74 100644
--- a/arrays/bit-xor.lsp
+++ b/arrays/bit-xor.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "bit-aux.lsp")
+
 
 (deftest bit-xor.1
   (let* ((s1 (make-array nil :initial-element 0 :element-type 'bit))
diff --git a/arrays/make-array.lsp b/arrays/make-array.lsp
index b7525d5ac7273da58a4911b6c84d0a14052725b1..b1173d443f1eea7bc5b08aa193ee1dbe162e48c8 100644
--- a/arrays/make-array.lsp
+++ b/arrays/make-array.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "array-aux.lsp")
+
 
 (deftest make-array.1
   (let ((a (make-array-with-checks 10)))
diff --git a/auxiliary/hash-table-aux.lsp b/auxiliary/hash-table-aux.lsp
index 6bf3d068a929bab9d3c1b660c22a3dde5e4242be..dd5ceb605801fe0052e2776ce306a6cfaa5e0351 100644
--- a/auxiliary/hash-table-aux.lsp
+++ b/auxiliary/hash-table-aux.lsp
@@ -6,7 +6,7 @@
 (in-package :cl-test)
 
 (eval-when (:load-toplevel :compile-toplevel :execute)
-  (compile-and-load "random-aux.lsp"))
+  (compile-and-load "ANSI-TESTS:AUX;random-aux.lsp"))
 
 (defparameter *hash-table-test-iters* 1000)
 
diff --git a/auxiliary/numbers-aux.lsp b/auxiliary/numbers-aux.lsp
index b9f3c5f61480d4b4474c88c805504f0a99f4f030..c9ef7b5daf14d22c27411bded3e77546ad83341e 100644
--- a/auxiliary/numbers-aux.lsp
+++ b/auxiliary/numbers-aux.lsp
@@ -6,7 +6,7 @@
 (in-package :cl-test)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (compile-and-load "random-aux.lsp"))
+  (compile-and-load "ANSI-TESTS:AUX;random-aux.lsp"))
 
 ;;; Binary search on reals
 
diff --git a/packages-00.lsp b/auxiliary/packages00-aux.lsp
similarity index 100%
rename from packages-00.lsp
rename to auxiliary/packages00-aux.lsp
diff --git a/auxiliary/printer-aux.lsp b/auxiliary/printer-aux.lsp
index 5846c67723b27e44ff0ddf1221716d2b74e76e97..f6d7ca3b9bd1e8e24428a4523115cad05ca8ab01 100644
--- a/auxiliary/printer-aux.lsp
+++ b/auxiliary/printer-aux.lsp
@@ -5,7 +5,8 @@
 
 (in-package :cl-test)
 
-(eval-when (:compile-toplevel :load-toplevel :execute) (compile-and-load "random-aux.lsp"))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (compile-and-load "ANSI-TESTS:AUX;random-aux.lsp"))
 
 (defmacro def-print-test (name form result &rest bindings)
   `(deftest ,name
diff --git a/auxiliary/string-aux.lsp b/auxiliary/string-aux.lsp
index be4d9080c21b45782ba8770b631817cb06d25eb8..9b00f849473a131b24158fd46e66050617f16b80 100644
--- a/auxiliary/string-aux.lsp
+++ b/auxiliary/string-aux.lsp
@@ -6,7 +6,7 @@
 (in-package :cl-test)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (compile-and-load "random-aux.lsp"))
+  (compile-and-load "ANSI-TESTS:AUX;random-aux.lsp"))
 
 (defun my-string-compare (string1 string2 comparison
                                   &key (start1 0) end1 (start2 0) end2 case
diff --git a/characters/name-char.lsp b/characters/name-char.lsp
index d60862c11716c0b44b85498e9711c95a35f53738..34530e71baf8821e717aeeee0d401ca7b7806e3a 100644
--- a/characters/name-char.lsp
+++ b/characters/name-char.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "char-aux.lsp")
+
 
 (deftest name-char.1
   (name-char.1.body)
diff --git a/cons/acons.lsp b/cons/acons.lsp
index f6da8ea54f9066244acfc0b6903def75ed3f73da..62424ec0d81e83c8633ac8db8414a86ef0575b3b 100644
--- a/cons/acons.lsp
+++ b/cons/acons.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest acons.1
   (let* ((x (copy-tree '((c . d) (e . f))))
diff --git a/cons/adjoin.lsp b/cons/adjoin.lsp
index c5b5a3c6c1fbfd2cf036c49ee7331dbbfcb2497e..ca9fe74c5472585f80e8698cbfd7723493633fa8 100644
--- a/cons/adjoin.lsp
+++ b/cons/adjoin.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest adjoin.1
   (adjoin 'a nil)
diff --git a/cons/append.lsp b/cons/append.lsp
index eb49d6a9cd50cec7b551b26d96a142be931c7a69..b80f124498e30560cad7963b9276ea738a41f4fb 100644
--- a/cons/append.lsp
+++ b/cons/append.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest append.1
   (append)
diff --git a/cons/assoc-if-not.lsp b/cons/assoc-if-not.lsp
index 37a969acd4b0871306fd49626797e8abf2d1b9fe..2586776cd887b2587b1b629d08ae830e24ca16e5 100644
--- a/cons/assoc-if-not.lsp
+++ b/cons/assoc-if-not.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest assoc-if-not.1
     (let* ((x (copy-list '((1 . a) (3 . b) (6 . c) (7 . d))))
diff --git a/cons/assoc.lsp b/cons/assoc.lsp
index b2cbb88599fb83ddeaedb10356bd89e6cacbde3e..78a08bd50fb6750f3a9c1eef054209d048299cdc 100644
--- a/cons/assoc.lsp
+++ b/cons/assoc.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest assoc.1
     (assoc nil nil)
diff --git a/cons/atom.lsp b/cons/atom.lsp
index 9e1e57e751eac9e45d2fcf0d3995cec1f3a734ec..3c825f42e55f7a27145dab562a0904d18d90ab53 100644
--- a/cons/atom.lsp
+++ b/cons/atom.lsp
@@ -5,8 +5,6 @@
 
 (in-package :cl-test)
 
-; (compile-and-load "cons-aux.lsp")
-
 (deftest atom.1
   (loop for x in *universe*
         unless (if (atom x) (not (consp x)) (consp x))
diff --git a/cons/butlast.lsp b/cons/butlast.lsp
index f8c9811eeedd7da41e1d4642d00a03f6f68e400f..577db6d3dd474cf9459218e32ff709fc3cb0c788 100644
--- a/cons/butlast.lsp
+++ b/cons/butlast.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest butlast.1
   (let ((x (list 'a 'b 'c 'd 'e)))
diff --git a/cons/cons-test-01.lsp b/cons/cons-test-01.lsp
index 28ba178a4b5324b5adf01c8f3371e00aeb844e94..d839d49f0c25094fabc7e26ec4e977afaef20795 100644
--- a/cons/cons-test-01.lsp
+++ b/cons/cons-test-01.lsp
@@ -7,7 +7,7 @@
 
 (declaim (optimize (safety 3)))
 
-(compile-and-load "cons-aux.lsp")
+
 
 ;;
 ;; Test the subtype relationships between null, list, cons and atom
diff --git a/cons/cons-test-03.lsp b/cons/cons-test-03.lsp
index 43173434b17c2a964ab07aae4f1733559810cc65..facd8666996d59372098c7dc21c11fb30bb66e1d 100644
--- a/cons/cons-test-03.lsp
+++ b/cons/cons-test-03.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; (typep <obj> 'list)
diff --git a/cons/cons-test-05.lsp b/cons/cons-test-05.lsp
index f56d087a5a57003143dee663d5f4514e7d6d147b..c7df1bcd89ab24f1be920b5cb09716bb14603ba4 100644
--- a/cons/cons-test-05.lsp
+++ b/cons/cons-test-05.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (defparameter *cons-accessors*
   '(first second third fourth fifth sixth seventh eighth ninth tenth
diff --git a/cons/cons.lsp b/cons/cons.lsp
index 565c122f2ebe3fd54d22ddec476d5b715382aeb8..f8c90a39a8f578d84b8513d8029c33f923d14c37 100644
--- a/cons/cons.lsp
+++ b/cons/cons.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 ;;; Various easy tests of cons
 
diff --git a/cons/consp.lsp b/cons/consp.lsp
index c2e7f4c3e3936d9ab9d30a5d9e7ce92e3fe10c5c..0b86de67fd83067f7a5729c9740d67c8919ff4bc 100644
--- a/cons/consp.lsp
+++ b/cons/consp.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 ;; Lists satisfy consp
 (deftest consp-list
diff --git a/cons/copy-alist.lsp b/cons/copy-alist.lsp
index 41e3739f0d5441cc44728b62025cc74ba03a533d..beaeec9c6fe1da15454ad5bb2d3fe8ac4c695c05 100644
--- a/cons/copy-alist.lsp
+++ b/cons/copy-alist.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest copy-alist.1
     (let* ((x (copy-tree '((a . b) (c . d) nil (e f) ((x) ((y z)) w)
diff --git a/cons/copy-list.lsp b/cons/copy-list.lsp
index c085c0898d537364d71cf69efa9e47cedb08f33c..e1d0bb6f9c414a650af2907a2bb38a3fe800d03f 100644
--- a/cons/copy-list.lsp
+++ b/cons/copy-list.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest copy-list.1
   (check-copy-list '(a b c d))
diff --git a/cons/copy-tree.lsp b/cons/copy-tree.lsp
index 8dd04243cc83169163b37fcb0046840d75d7c591..769dca26d88a568a6a5555b88d6e57eaf4f866b5 100644
--- a/cons/copy-tree.lsp
+++ b/cons/copy-tree.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 ;; Try copy-tree on a tree containing elements of various kinds
 (deftest copy-tree.1
diff --git a/cons/cxr.lsp b/cons/cxr.lsp
index ae892d19b5badcbd71d199a1d690dfbaf1a3820e..63a9e6c73d2cfee6c39b08ab1d07b2717ffb98e2 100644
--- a/cons/cxr.lsp
+++ b/cons/cxr.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 ;; Tests of car, cdr and compound forms
 (deftest cons.23
diff --git a/cons/endp.lsp b/cons/endp.lsp
index 1b5323ced0457308902ace781e121a25881bef83..3e8e2540e0c789c48b9d4d22478c0aa786c8bc1f 100644
--- a/cons/endp.lsp
+++ b/cons/endp.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest endp-nil
   (notnot-mv (endp nil))
diff --git a/cons/get-properties.lsp b/cons/get-properties.lsp
index f38831e0c0893f3f26e95b9c48ab19516861cdf2..fd265257e24cf19ae2bdd99c647f2a47ade1c77b 100644
--- a/cons/get-properties.lsp
+++ b/cons/get-properties.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest get-properties.1
   (get-properties nil nil)
diff --git a/cons/getf.lsp b/cons/getf.lsp
index c63feb51a72fe2c4dcb7708859eea6fd5bf7ee9b..533923f363e674f95f4930a1fb56fd2e4a8ac75a 100644
--- a/cons/getf.lsp
+++ b/cons/getf.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest getf.1
   (getf nil 'a)
diff --git a/cons/intersection.lsp b/cons/intersection.lsp
index 574a405a42619a9d036b13b2cb0e414dee4443fe..826326b419801cae55e1ffc36bd95c66e7793981 100644
--- a/cons/intersection.lsp
+++ b/cons/intersection.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest intersection.1
   (intersection nil nil)
diff --git a/cons/last.lsp b/cons/last.lsp
index 2323d54507b9c6c6e13616185fbe13af2e7d60a9..dbb5b7e99013bddb10b47256e28e4610b5f686c2 100644
--- a/cons/last.lsp
+++ b/cons/last.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest last.1
   (last nil)
diff --git a/cons/ldiff.lsp b/cons/ldiff.lsp
index b031d6fe3b26940177f8c6d8c0e275ac5d687381..828853206f97b9a43547e9b2a637574462bc7162 100644
--- a/cons/ldiff.lsp
+++ b/cons/ldiff.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest ldiff.1
   (let* ((x (copy-tree '(a b c d e f)))
diff --git a/cons/list-length.lsp b/cons/list-length.lsp
index ecde7b01cc23bdd9f5e0f81c7a3a512b0b682bca..9632d5b265def6b6f5159844ecfd9b3a2d8e1b62 100644
--- a/cons/list-length.lsp
+++ b/cons/list-length.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest list-length-nil
   (list-length nil)
diff --git a/cons/list.lsp b/cons/list.lsp
index ee5761e4428a868773796e64fdb0afd938713172..af3a767267eb146dd570f838079fbf7cb2647141 100644
--- a/cons/list.lsp
+++ b/cons/list.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest list.1
   (list 'a 'b 'c)
diff --git a/cons/listp.lsp b/cons/listp.lsp
index df099d1319f39d8ddc61ce5ae01a3385fbb6801d..ef5aef1c56b1e082a614b23de32732936a665705 100644
--- a/cons/listp.lsp
+++ b/cons/listp.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest listp-nil
   (notnot-mv (listp nil))
diff --git a/cons/make-list.lsp b/cons/make-list.lsp
index f7b88b588edc1a5db517fcf61b960b6bf75f85ec..d9971ebd22c9f15ebe39fe62f708fa53cf3175df 100644
--- a/cons/make-list.lsp
+++ b/cons/make-list.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest make-list-empty.1
   (make-list 0)
diff --git a/cons/mapc.lsp b/cons/mapc.lsp
index 4c9a6544f30b831dda15630e53c67bf531bfb9c4..97f8ba21454e9ea2f8c2f2a491f2124a472e100f 100644
--- a/cons/mapc.lsp
+++ b/cons/mapc.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest mapc.1
   (mapc #'list nil)
diff --git a/cons/mapcan.lsp b/cons/mapcan.lsp
index c5b2f6e8767697ac6d8e8fcb5f09cbf8dc8d5e8a..221e9c8ba9045b6efb07a708378b7bdb40af08aa 100644
--- a/cons/mapcan.lsp
+++ b/cons/mapcan.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest mapcan.1
   (mapcan #'list nil)
diff --git a/cons/mapcar.lsp b/cons/mapcar.lsp
index 34bb0e9c0de390492a08447229462b007cadad76..bd59424f847c37782a16fe40d1b01e0ecf8bbedd 100644
--- a/cons/mapcar.lsp
+++ b/cons/mapcar.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest mapcar.1
   (mapcar #'1+ nil)
diff --git a/cons/mapcon.lsp b/cons/mapcon.lsp
index d61ffd3b2c5ab4476f36ce8baa0c77433759d3e5..ce307ee2bb6b577630ac5d6d81186b836da87c58 100644
--- a/cons/mapcon.lsp
+++ b/cons/mapcon.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest mapcon.1
   (mapcon #'(lambda (x) (append '(a) x nil)) nil)
diff --git a/cons/mapl.lsp b/cons/mapl.lsp
index 08ac582449e623c477a1875d3be0b965723f0af8..187beca089b14b30a5ababfa25dbb5d6b7a1a9a5 100644
--- a/cons/mapl.lsp
+++ b/cons/mapl.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest mapl.1
   (mapl #'list nil)
diff --git a/cons/maplist.lsp b/cons/maplist.lsp
index 5d6c33a3f2bb8d5c6464795e08b631088ca99497..78eb8b35cecd4cc4e65892e7caf796ae6281c604 100644
--- a/cons/maplist.lsp
+++ b/cons/maplist.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest maplist.1
   (maplist #'list nil)
diff --git a/cons/member-if-not.lsp b/cons/member-if-not.lsp
index 69ee39a146904f948d9cf52a900621dee9cb30c7..83ec8016f15fc05edfa2da89a1449c4735c26743 100644
--- a/cons/member-if-not.lsp
+++ b/cons/member-if-not.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest member-if-not.1
   (member-if-not #'listp nil)
diff --git a/cons/member-if.lsp b/cons/member-if.lsp
index 6811179481dd5bba5ac7b01bff21d3731d78dafe..04228ee5814f97cb1522feaa442396a1f772924e 100644
--- a/cons/member-if.lsp
+++ b/cons/member-if.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest member-if.1
   (member-if #'listp nil)
diff --git a/cons/member.lsp b/cons/member.lsp
index 826db8e3b0433752ebd63cae55f59e2ae3058b13..ce6684ccd346bfce3d5336e55e0ccda4e9397d9c 100644
--- a/cons/member.lsp
+++ b/cons/member.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest member.1
   (let* ((x (copy-tree '(a b c d e f)))
diff --git a/cons/nbutlast.lsp b/cons/nbutlast.lsp
index db433823cf56527fdefca5d7cb0b33c22804534b..c72b492b1a3bffda076ace8a1b69e43868ab242b 100644
--- a/cons/nbutlast.lsp
+++ b/cons/nbutlast.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest nbutlast.1
   (let ((x (list 'a 'b 'c 'd 'e)))
diff --git a/cons/nconc.lsp b/cons/nconc.lsp
index c660ca2327d722191283cfb4b54cf002ed8e2f57..f337338c427326477dfde45b9ee1a70a3baa50a2 100644
--- a/cons/nconc.lsp
+++ b/cons/nconc.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest nconc.1
   (nconc)
diff --git a/cons/nintersection.lsp b/cons/nintersection.lsp
index 13d23b0d188d5730d68045bc8ad6885f0ac1ff56..88c5009915e1a430402c5cff54fb4e1d0acdeed1 100644
--- a/cons/nintersection.lsp
+++ b/cons/nintersection.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest nintersection.1
   (nintersection nil nil)
diff --git a/cons/nreconc.lsp b/cons/nreconc.lsp
index 3ebf2789f2fa1ffe636ab6322a74a1f6274087a0..51b2303d2e1a912d6bf8a7e59e80eb74484531fd 100644
--- a/cons/nreconc.lsp
+++ b/cons/nreconc.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest nreconc.1
   (let* ((x (list 'a 'b 'c))
diff --git a/cons/nset-difference.lsp b/cons/nset-difference.lsp
index 2e1a74a804ae37f8b0cfcae9ff69e1a11256c57d..77bdb2d628af08747985e1a8aee737b7d3d559a6 100644
--- a/cons/nset-difference.lsp
+++ b/cons/nset-difference.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest nset-difference.1
   (nset-difference nil nil)
diff --git a/cons/nset-exclusive-or.lsp b/cons/nset-exclusive-or.lsp
index dcb40b7920156718b943d8e9327c4b03159b35ca..7252e31c5b982ccb5fec43045b7672aa99e6e1b0 100644
--- a/cons/nset-exclusive-or.lsp
+++ b/cons/nset-exclusive-or.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest nset-exclusive-or.1
   (nset-exclusive-or nil nil)
diff --git a/cons/nsublis.lsp b/cons/nsublis.lsp
index a33a5d598a0022cb8742f18a12b9a6cb2eff76c1..afc15be451baf6f305424f9181f9eba1becf7830 100644
--- a/cons/nsublis.lsp
+++ b/cons/nsublis.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest nsublis.1
   (check-nsublis '((a b) g (d e 10 g h) 15 . g)
diff --git a/cons/nsubst-if-not.lsp b/cons/nsubst-if-not.lsp
index ba7131df03d361487f559e93a743dfb47268b5c5..4ecf9e8f2a147c23e24ada995fb599eeadee343d 100644
--- a/cons/nsubst-if-not.lsp
+++ b/cons/nsubst-if-not.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest nsubst-if-not.1
   (check-nsubst-if-not '(x) 'consp '(1 (1 2) (1 2 3) (1 2 3 4)))
diff --git a/cons/nsubst-if.lsp b/cons/nsubst-if.lsp
index ea88373a3fdb42c8e84a944942142ed09f8ce868..74bd5790f3f3b087d55a99cae9707d52e739020a 100644
--- a/cons/nsubst-if.lsp
+++ b/cons/nsubst-if.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest nsubst-if.1
     (check-nsubst-if 'a #'consp '((100 1) (2 3) (4 3 2 1) (a b c)))
diff --git a/cons/nsubst.lsp b/cons/nsubst.lsp
index e97863d92767b819c727bed0ec9bb3dd42a2b8fb..4788ab63fa87cbfc26dccb6e363cde31e7273cc6 100644
--- a/cons/nsubst.lsp
+++ b/cons/nsubst.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (defvar *nsubst-tree-1* '(10 (30 20 10) (20 10) (10 20 30 40)))
 
diff --git a/cons/nth.lsp b/cons/nth.lsp
index 333751e88ad425129d00b010e417d7f31dc20838..5aa3b517d6f0db5d4641eaad21630dd906405241 100644
--- a/cons/nth.lsp
+++ b/cons/nth.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest nth.1
   (nth-1-body (loop for i from 1 to 2000 collect (* 4 i)))
diff --git a/cons/nthcdr.lsp b/cons/nthcdr.lsp
index 36e681510ce1a3668709e11e1346ab21b3bffa93..5b73e4c9427cc786b3a1abbcd76b72061e5c3856 100644
--- a/cons/nthcdr.lsp
+++ b/cons/nthcdr.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 ;;; Error tests
 
diff --git a/cons/nunion.lsp b/cons/nunion.lsp
index 4a9974e5db039f837ca1ec79a542feb9319a2b8e..018b77fe688f4b41f57f9c0216a475a81cb4ccb9 100644
--- a/cons/nunion.lsp
+++ b/cons/nunion.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest nunion.1
     (nunion nil nil)
diff --git a/cons/pairlis.lsp b/cons/pairlis.lsp
index d9625e578983c918fc99e472b71e3272ba10999c..e9d35478f5d5c2af46c2c98ec843174d3743f7d3 100644
--- a/cons/pairlis.lsp
+++ b/cons/pairlis.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 ;; Pairlis has two legal behaviors: the pairs
 ;; can be prepended in the same order, or in the
diff --git a/cons/pop.lsp b/cons/pop.lsp
index 3d225b0db2f8c8c609cfdbfebd9956a502f71f25..6c0f186e83efeb9998eb01c8d6446bfdabe45ee4 100644
--- a/cons/pop.lsp
+++ b/cons/pop.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest pop.1
   (let ((x (copy-tree '(a b c))))
diff --git a/cons/push.lsp b/cons/push.lsp
index e1d97bddc2ce3684dcdde5916e6730da579bb8e7..a8d9d4da8e9bf65250196caa454c0666c80576e4 100644
--- a/cons/push.lsp
+++ b/cons/push.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 ;;; See also places.lsp
 
diff --git a/cons/pushnew.lsp b/cons/pushnew.lsp
index e3faa9909a1d8f538eff3e2a797b82ff1e9105a0..dac46e79a07ad8ba93bf72eef9933c0ec7572996 100644
--- a/cons/pushnew.lsp
+++ b/cons/pushnew.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest pushnew.1
   (let ((x nil))
diff --git a/cons/rassoc-if-not.lsp b/cons/rassoc-if-not.lsp
index 8726637529a3e00c353f2f2e42445906a90d2665..365ed61fcefe3277b1e2ed973639c2412da7eaf9 100644
--- a/cons/rassoc-if-not.lsp
+++ b/cons/rassoc-if-not.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest rassoc-if-not.1
     (let* ((x (rev-assoc-list '((1 . a) (3 . b) (6 . c) (7 . d))))
diff --git a/cons/rassoc-if.lsp b/cons/rassoc-if.lsp
index 9a854ee2587d80e42282b29143c7724233aa2a5c..5f879fe2dedaa9f961e31436396ac33dfe00a41c 100644
--- a/cons/rassoc-if.lsp
+++ b/cons/rassoc-if.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest rassoc-if.1
     (let* ((x (rev-assoc-list '((1 . a) (3 . b) (6 . c) (7 . d))))
diff --git a/cons/rassoc.lsp b/cons/rassoc.lsp
index 9b06641498ad2765ddaa52ff25353dcc3d08a14d..81ae1c00dab3b7dc00520c978e3e0b16f4aa572b 100644
--- a/cons/rassoc.lsp
+++ b/cons/rassoc.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest rassoc.1
   (rassoc nil nil)
diff --git a/cons/remf.lsp b/cons/remf.lsp
index 5b8dc45042fdbac36adae94e4148ab12392b8f17..e7d09982a9698ca94020c5ebf2f28f79d0331fbd 100644
--- a/cons/remf.lsp
+++ b/cons/remf.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest remf.1
   (let ((x nil))
diff --git a/cons/rest.lsp b/cons/rest.lsp
index 6fb9f5ec3a29b26b8004978a4d1417f847e04f16..c758314e6a4030f0566343fccc42318d839269a8 100644
--- a/cons/rest.lsp
+++ b/cons/rest.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest rest.1
   (rest (list 'a 'b 'c))
diff --git a/cons/revappend.lsp b/cons/revappend.lsp
index 028059fb860e5ecc519c48863ec1af5d505c4981..1c16f204657b967b63d21ec7a3f6551291fcfd9e 100644
--- a/cons/revappend.lsp
+++ b/cons/revappend.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest revappend.1
     (let* ((x (list 'a 'b 'c))
diff --git a/cons/rplaca.lsp b/cons/rplaca.lsp
index 195bb6ef9c16165a1ddbdc6508912453f670fca7..eddf7647e95180fc7c31a93a998513890a214ab4 100644
--- a/cons/rplaca.lsp
+++ b/cons/rplaca.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest rplaca.1
   (let ((x (cons 'a 'b)))
diff --git a/cons/rplacd.lsp b/cons/rplacd.lsp
index 6dd3e4381692bdfaee2fd0b669dacbea344538fd..0744d717f687006bd20478ca1d8f1b11fa098fbb 100644
--- a/cons/rplacd.lsp
+++ b/cons/rplacd.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest rplacd.1
   (let ((x (cons 'a 'b)))
diff --git a/cons/set-difference.lsp b/cons/set-difference.lsp
index 9216417ebcccab3a155ca31a222e2cb4444c5913..803242a9941b189eb5795bb73aaf9c0ebcee85fc 100644
--- a/cons/set-difference.lsp
+++ b/cons/set-difference.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest set-difference.1
   (set-difference nil nil)
diff --git a/cons/set-exclusive-or.lsp b/cons/set-exclusive-or.lsp
index fa508d5cb28d4280b635562292868044c8ca4c87..f4ebc5cc7fb09ccf452652d1fb277441730073e6 100644
--- a/cons/set-exclusive-or.lsp
+++ b/cons/set-exclusive-or.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest set-exclusive-or.1
   (set-exclusive-or nil nil)
diff --git a/cons/sublis.lsp b/cons/sublis.lsp
index 84a66623b8a0fc44a38f562ca33ece68417b5ab8..9b231e855ad977898bf5d8d5ac0672357b709d6b 100644
--- a/cons/sublis.lsp
+++ b/cons/sublis.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest sublis.1
   (check-sublis '((a b) g (d e 10 g h) 15 . g)
diff --git a/cons/subsetp.lsp b/cons/subsetp.lsp
index 196f124fecb0c4d679662f645549f3f19e6e6772..7e2793175aaa50c28d642e6c0e48072377884c73 100644
--- a/cons/subsetp.lsp
+++ b/cons/subsetp.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (defvar cons-test-24-var '(78 "z" (8 9)))
 
diff --git a/cons/subst-if-not.lsp b/cons/subst-if-not.lsp
index e95b0b9ae713b88795551c72358321fb49e8710f..741c18bcbc325ffbd5ae1eb9298aae41a24beee7 100644
--- a/cons/subst-if-not.lsp
+++ b/cons/subst-if-not.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest subst-if-not.1
   (check-subst-if-not '(x) 'consp '(1 (1 2) (1 2 3) (1 2 3 4)))
diff --git a/cons/subst-if.lsp b/cons/subst-if.lsp
index 7a3493de89465f115be8ff8bfb5d97638a365644..cc18745b701adca821f32e707612f604e27c4ffe 100644
--- a/cons/subst-if.lsp
+++ b/cons/subst-if.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest subst-if.1
   (check-subst-if 'a #'consp '((100 1) (2 3) (4 3 2 1) (a b c)))
diff --git a/cons/subst.lsp b/cons/subst.lsp
index 5ca4e0807003afcd0c51b365891abfab9887d0ef..54228aed8dc531ed21944eb870346a3728fb39be 100644
--- a/cons/subst.lsp
+++ b/cons/subst.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (defvar *subst-tree-1* '(10 (30 20 10) (20 10) (10 20 30 40)))
 
diff --git a/cons/tailp.lsp b/cons/tailp.lsp
index f21bc77d31c711d796acc6d0796d876fa7b2a093..56f20cab101807cccad1870add63bb586bdb3b5b 100644
--- a/cons/tailp.lsp
+++ b/cons/tailp.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest tailp.1
   (let ((x (copy-tree '(a b c d e . f))))
diff --git a/cons/tree-equal.lsp b/cons/tree-equal.lsp
index deddb61ec3c7a8f5a58e5751eab85c98b470e148..a7e4a4a82f45d9f1412cae48c7223a4c3e799bc6 100644
--- a/cons/tree-equal.lsp
+++ b/cons/tree-equal.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest tree-equal.1
   (notnot-mv (tree-equal 'a 'a))
diff --git a/cons/union.lsp b/cons/union.lsp
index 400793cf97823167876fee035bd277598999dc9c..489d62b4a666d6efdfba0ea64e168756e7437499 100644
--- a/cons/union.lsp
+++ b/cons/union.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "cons-aux.lsp")
+
 
 (deftest union.1
   (union nil nil)
diff --git a/data-and-control-flow/assoc-if.lsp b/data-and-control-flow/assoc-if.lsp
deleted file mode 100644
index 2dd39d9f9da74e3c6229a14bea6c2b168f017636..0000000000000000000000000000000000000000
--- a/data-and-control-flow/assoc-if.lsp
+++ /dev/null
@@ -1,181 +0,0 @@
-;-*- Mode:     Lisp -*-
-;;;; Author:   Paul Dietz
-;;;; Created:  Sun Apr 20 07:27:57 2003
-;;;; Contains: Tests of ASSOC-IF
-
-(in-package :cl-test)
-
-(compile-and-load "cons-aux.lsp")
-
-(deftest assoc-if.1
-    (let* ((x (copy-list '((1 . a) (3 . b) (6 . c) (7 . d))))
-           (xcopy (make-scaffold-copy x))
-           (result (assoc-if #'evenp x)))
-      (and
-       (check-scaffold-copy x xcopy)
-       (eqt result (third x))
-       result))
-  (6 . c))
-
-(deftest assoc-if.2
-  (let* ((x (copy-list '((1 . a) (3 . b) (6 . c) (7 . d))))
-         (xcopy (make-scaffold-copy x))
-         (result (assoc-if #'oddp x :key #'1+)))
-    (and
-     (check-scaffold-copy x xcopy)
-     (eqt result (third x))
-     result))
-  (6 . c))
-
-(deftest assoc-if.3
-    (let* ((x (copy-list '((1 . a) nil (3 . b) (6 . c) (7 . d))))
-           (xcopy (make-scaffold-copy x))
-           (result (assoc-if #'evenp x)))
-      (and
-       (check-scaffold-copy x xcopy)
-       (eqt result (fourth x))
-       result))
-  (6 . c))
-
-(deftest assoc-if.4
-  (assoc-if #'null '((a . b) nil (c . d) (nil . e) (f . g)))
-  (nil . e))
-
-(deftest assoc-if.5
-  (let () (assoc-if #'null '((a . b) nil (c . d) (nil . e) (f . g))))
-  (nil . e))
-
-
-;;; Order of argument evaluation
-
-(deftest assoc-if.order.1
-  (let ((i 0) x y)
-    (values
-     (assoc-if (progn (setf x (incf i)) #'null)
-               (progn (setf y (incf i))
-                      '((a . 1) (b . 2) (nil . 17) (d . 4))))
-     i x y))
-  (nil . 17) 2 1 2)
-
-(deftest assoc-if.order.2
-  (let ((i 0) x y z)
-    (values
-     (assoc-if (progn (setf x (incf i)) #'null)
-               (progn (setf y (incf i))
-                      '((a . 1) (b . 2) (nil . 17) (d . 4)))
-               :key (progn (setf z (incf i)) #'null))
-     i x y z))
-  (a . 1) 3 1 2 3)
-
-;;; Keyword tests
-
-(deftest assoc-if.allow-other-keys.1
-  (assoc-if #'null '((a . 1) (nil . 2) (c . 3)) :bad t :allow-other-keys t)
-  (nil . 2))
-
-(deftest assoc-if.allow-other-keys.2
-  (assoc-if #'null '((a . 1) (nil . 2) (c . 3))
-            :allow-other-keys t :also-bad t)
-  (nil . 2))
-
-(deftest assoc-if.allow-other-keys.3
-  (assoc-if #'null '((a . 1) (nil . 2) (c . 3))
-            :allow-other-keys t :also-bad t :key #'not)
-  (a . 1))
-
-(deftest assoc-if.allow-other-keys.4
-  (assoc-if #'null '((a . 1) (nil . 2) (c . 3)) :allow-other-keys t)
-  (nil . 2))
-
-(deftest assoc-if.allow-other-keys.5
-  (assoc-if #'null '((a . 1) (nil . 2) (c . 3)) :allow-other-keys nil)
-  (nil . 2))
-
-(deftest assoc-if.keywords.6
-  (assoc-if #'null '((a . 1) (nil . 2) (c . 3)) :key #'identity :key #'null)
-  (nil . 2))
-
-(deftest assoc-if.keywords.7
-  (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
-  (signals-error (assoc-if) program-error)
-  t)
-
-(deftest assoc-if.error.2
-  (signals-error (assoc-if #'null) program-error)
-  t)
-
-(deftest assoc-if.error.3
-  (signals-error (assoc-if #'null nil :bad t)
-                 program-error)
-  t)
-
-(deftest assoc-if.error.4
-  (signals-error (assoc-if #'null nil :key)
-                 program-error)
-  t)
-
-(deftest assoc-if.error.5
-  (signals-error (assoc-if #'null nil 1 1)
-                 program-error)
-  t)
-
-(deftest assoc-if.error.6
-  (signals-error (assoc-if #'null nil :bad t :allow-other-keys nil)
-                 program-error)
-  t)
-
-(deftest assoc-if.error.7
-  (signals-error (assoc-if #'cons '((a b)(c d)))
-                 program-error)
-  t)
-
-(deftest assoc-if.error.8
-  (signals-error (assoc-if #'identity '((a b)(c d)) :key #'cons)
-                 program-error)
-  t)
-
-(deftest assoc-if.error.9
-  (signals-type-error x 'a (assoc-if #'car '((a b)(c d))))
-  t)
-
-(deftest assoc-if.error.10
-  (signals-type-error x 'a (assoc-if #'identity '((a b)(c d)) :key #'car))
-  t)
-
-(deftest assoc-if.error.11
-  (signals-error (assoc-if #'null '((a . b) . c))
-                 type-error)
-  t)
-
-(deftest assoc-if.error.12
-  (signals-error (assoc-if #'null '((a . b) :bad (c . d)))
-                 type-error)
-  t)
-
-(deftest assoc-if.error.13
-  (signals-type-error x 'y (assoc-if #'null x))
-  t)
diff --git a/data-and-control-flow/equalp.lsp b/data-and-control-flow/equalp.lsp
index 4dc775966a564eb3ad07b252346895bb4b693953..0f69993b98bb529d430cd02fbff820cf6f981819 100644
--- a/data-and-control-flow/equalp.lsp
+++ b/data-and-control-flow/equalp.lsp
@@ -5,8 +5,6 @@
 
 (in-package :cl-test)
 
-(compile-and-load "random-aux.lsp")
-
 (deftest equalp.1
   (loop for c across +base-chars+
         always (loop for d across +base-chars+
diff --git a/data-and-control-flow/etypecase.lsp b/data-and-control-flow/etypecase.lsp
index ceef833b3225ae4ce31fb64986363466aceec500..2a6ab1ca1fd85a34ac7103863b49de1f91c9a7f2 100644
--- a/data-and-control-flow/etypecase.lsp
+++ b/data-and-control-flow/etypecase.lsp
@@ -5,8 +5,6 @@
 
 (in-package :cl-test)
 
-(compile-and-load "types-aux.lsp")
-
 (deftest etypecase.1
   (etypecase 1 (integer 'a) (t 'b))
   a)
diff --git a/format/format-a.lsp b/format/format-a.lsp
index b7d1b02a648e83844ea9cb1b732474f4c43af307..5c0b44cd9300949620c74ad2ba09e50802d055c4 100644
--- a/format/format-a.lsp
+++ b/format/format-a.lsp
@@ -4,7 +4,7 @@
 ;;;; Contains: Tests of printing using the ~A directive
 
 (in-package :cl-test)
-(compile-and-load "printer-aux.lsp")
+
 
 (def-format-test format.a.1
   "~a" (nil) "NIL")
diff --git a/format/format-ampersand.lsp b/format/format-ampersand.lsp
index 3063da9a6d5a15e7297466ad410bc532deebf49c..44583472cccfa2dd4f542bce5e593ee95276d26b 100644
--- a/format/format-ampersand.lsp
+++ b/format/format-ampersand.lsp
@@ -4,7 +4,7 @@
 ;;;; Contains: Tests of format with ~& directive
 
 (in-package :cl-test)
-(compile-and-load "printer-aux.lsp")
+
 
 (def-format-test format.&.1
   "~0&" nil "")
diff --git a/format/format-b.lsp b/format/format-b.lsp
index c4a648756633003df3178132187e8b2e673ebf31..dafc51d521a23c113caec8b3ba3c59277d716bf9 100644
--- a/format/format-b.lsp
+++ b/format/format-b.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (deftest format.b.1
   (let ((fn (formatter "~b")))
diff --git a/format/format-brace.lsp b/format/format-brace.lsp
index e33043134eb81a036c43d4a7e08a1ccce9c6b44d..8f5aafb295785ee2e0fc7274e472dd2818a35548 100644
--- a/format/format-brace.lsp
+++ b/format/format-brace.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (def-format-test format.{.1
   (concatenate 'string "~{~" (string #\Newline) "~}")
diff --git a/format/format-c.lsp b/format/format-c.lsp
index 1a8822dc9f81324798489554c2d816c4b4471f11..dec2937a8453b38347dc3504b8b3d1791a32c23e 100644
--- a/format/format-c.lsp
+++ b/format/format-c.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 ;;; Test of the ~C directive
 
diff --git a/format/format-circumflex.lsp b/format/format-circumflex.lsp
index 52e6fbbaf7c0c0eba27047d0bda73353b029b7a0..c028c3d80d0e0b78493ed4da46c7ee7ee12acf8b 100644
--- a/format/format-circumflex.lsp
+++ b/format/format-circumflex.lsp
@@ -4,7 +4,7 @@
 ;;;; Contains: Tests of the ~^ format directive (inside other format constructs)
 
 (in-package :cl-test)
-(compile-and-load "printer-aux.lsp")
+
 
 ;;; Tests of ~^ inside ~{ ... ~}
 
diff --git a/format/format-conditional.lsp b/format/format-conditional.lsp
index 66b728e5d795b5069ff6081527465f925b2f6519..8b2c955b4fe160a82a097979c16757d8886bb93b 100644
--- a/format/format-conditional.lsp
+++ b/format/format-conditional.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (def-format-test format.cond.1
   "~[~]" (0) "")
diff --git a/format/format-d.lsp b/format/format-d.lsp
index cb86b7006b53d91495ee0bd894970cc313f60d47..8d065e4a28aa57e32ec20d9ff45dfc73e8b7dc2d 100644
--- a/format/format-d.lsp
+++ b/format/format-d.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (deftest format.d.1
   (with-standard-io-syntax
diff --git a/format/format-f.lsp b/format/format-f.lsp
index d690008b16dda12393fb510e9015f5f81436c0f3..d35f5d4726b08ee1e8d1d0e7d145b3fa42d552d4 100644
--- a/format/format-f.lsp
+++ b/format/format-f.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 ;;; Equivalent to PRIN1 for 0 or (abs x) in range [10^-3,10^7).
 
diff --git a/format/format-goto.lsp b/format/format-goto.lsp
index 308b0cd3749d06501fc174c39583851e03dd9cb9..77f0a6f37be3086f17f194c60fa97022a3ff0f41 100644
--- a/format/format-goto.lsp
+++ b/format/format-goto.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 ;;; ~*
 
diff --git a/format/format-i.lsp b/format/format-i.lsp
index a58124eb5e6238e6828c7f2efae0c4521662d748..acd375f388d5a21b893293ff0eb46a0dd36dca76 100644
--- a/format/format-i.lsp
+++ b/format/format-i.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 ;;; pprint-indent.9
 (def-pprint-test format.i.1
diff --git a/format/format-justify.lsp b/format/format-justify.lsp
index 45be9d7e6167ce061e8bd82f23fecd4e001af88f..cc388807007da2a76b7d216ad073fea3daaa020a 100644
--- a/format/format-justify.lsp
+++ b/format/format-justify.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (def-pprint-test format.justify.1
   (format nil "~<~>")
diff --git a/format/format-logical-block.lsp b/format/format-logical-block.lsp
index 5f764f4e303d4f8fbf481aff28fb1d8d2f962c02..fc13e0ec3154bdcdb996148908b79b132b5c3987 100644
--- a/format/format-logical-block.lsp
+++ b/format/format-logical-block.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 ;;; Error cases
 
diff --git a/format/format-newline.lsp b/format/format-newline.lsp
index 1aad825dcd10bf92ef79aea50e7aeeb76857d372..740d02c5f817fca9034077cb9d7d2c90deaef1d1 100644
--- a/format/format-newline.lsp
+++ b/format/format-newline.lsp
@@ -4,7 +4,7 @@
 ;;;; Contains: Tests of ~<newline>
 
 (in-package :cl-test)
-(compile-and-load "printer-aux.lsp")
+
 
 (def-format-test format.newline.1
   (concatenate 'string "~" (string #\Newline) "   X")
diff --git a/format/format-o.lsp b/format/format-o.lsp
index 4ded9b77a6e5791a6263d27756b0da9e0fb1199e..f2ec25af4e9ad600586cc6cc90e33f232be4b959 100644
--- a/format/format-o.lsp
+++ b/format/format-o.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (deftest format.o.1
   (let ((fn (formatter "~o")))
diff --git a/format/format-p.lsp b/format/format-p.lsp
index adfa42d7b11a68f3262b0251806b058f329f6c32..28bb2e8f4ccbd223b52ebe45416f605e5b54292f 100644
--- a/format/format-p.lsp
+++ b/format/format-p.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (def-format-test format.p.1
   "~p" (1) "")
diff --git a/format/format-page.lsp b/format/format-page.lsp
index 2320f18bb2f33eb8b1be92cbf36e0525ffa55609..147140b7f38ed41da3aadb14a8e07a574e67f351 100644
--- a/format/format-page.lsp
+++ b/format/format-page.lsp
@@ -4,7 +4,7 @@
 ;;;; Contains: Tests of format with ~| directive
 
 (in-package :cl-test)
-(compile-and-load "printer-aux.lsp")
+
 
 (def-format-test format.page.1
   "~0|" nil "")
diff --git a/format/format-paren.lsp b/format/format-paren.lsp
index c79a05753cefb8ad71c057d85aeef72c2289d1f4..d5c7dba28bf3fcb6e87615ad604b98f414be39cd 100644
--- a/format/format-paren.lsp
+++ b/format/format-paren.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (def-format-test format.paren.1
   "~(XXyy~AuuVV~)" ("ABc dEF ghI") "xxyyabc def ghiuuvv")
diff --git a/format/format-percent.lsp b/format/format-percent.lsp
index 96813b5c9b9797065b9788c918782c51f9a7b22b..99d1a4386dab81652bc46c959e1296b1ac6af929 100644
--- a/format/format-percent.lsp
+++ b/format/format-percent.lsp
@@ -4,7 +4,7 @@
 ;;;; Contains: Tests of format with ~% directive
 
 (in-package :cl-test)
-(compile-and-load "printer-aux.lsp")
+
 
 (def-format-test format.%.1
   "~%" nil #.(string #\Newline))
diff --git a/format/format-question.lsp b/format/format-question.lsp
index 582e0a8f3a705848760e731b986719747885569e..3b86a2ba388979c5c69b182a8b606fdc6a20a10d 100644
--- a/format/format-question.lsp
+++ b/format/format-question.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (def-format-test format.?.1
   "~?" ("" nil) "")
diff --git a/format/format-r.lsp b/format/format-r.lsp
index 81b6cff6e3e1b77983e059ae845d8330799ee32d..c9c1580b861e3c254b915d77f52f06b2f84ee7cd 100644
--- a/format/format-r.lsp
+++ b/format/format-r.lsp
@@ -6,7 +6,7 @@
 (in-package :cl-test)
 
 ;;; Test of various radixes
-(compile-and-load "printer-aux.lsp")
+
 (compile-and-load "roman-numerals.lsp")
 
 (deftest format.r.1
diff --git a/format/format-s.lsp b/format/format-s.lsp
index 75956475f9659f2ead23bab0bac321672f9f9f20..cf820bbb4885744fe80fa68145353ac2a18a19e5 100644
--- a/format/format-s.lsp
+++ b/format/format-s.lsp
@@ -4,7 +4,7 @@
 ;;;; Contains: Test of the ~S format directive
 
 (in-package :cl-test)
-(compile-and-load "printer-aux.lsp")
+
 
 (deftest format.s.1
   (let ((*print-readably* nil)
diff --git a/format/format-slash.lsp b/format/format-slash.lsp
index aa6e9739d2bf49b3bb27b176b397d6dcde06eedf..b62715f60ceeca915a44c3dfa015288ef1cfc6f8 100644
--- a/format/format-slash.lsp
+++ b/format/format-slash.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (def-pprint-test format./.1
   (format nil "~/pprint-linear/" 1)
diff --git a/format/format-t.lsp b/format/format-t.lsp
index 0446e17c0576af9dae4afe4f32571a2f55adbb7c..8b8927995165fe4b2c8b0c318572f1968e939590 100644
--- a/format/format-t.lsp
+++ b/format/format-t.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (def-pprint-test format.t.1
   (format nil "~0,0T")
diff --git a/format/format-tilde.lsp b/format/format-tilde.lsp
index 470c2ccf39b0ca9357b02c1d2abe0d8bf1c035fd..b062f63a55045f054c672906a242da799415084d 100644
--- a/format/format-tilde.lsp
+++ b/format/format-tilde.lsp
@@ -4,7 +4,7 @@
 ;;;; Contains: Tests of format directive ~~
 
 (in-package :cl-test)
-(compile-and-load "printer-aux.lsp")
+
 
 (def-format-test format.~.1
   "~~" nil "~")
diff --git a/format/format-underscore.lsp b/format/format-underscore.lsp
index a6c6e8e6d4f87bb29a9e30393c59156e90eea55c..2656b894a5e9a71932e726d4e8de7262c4a285f8 100644
--- a/format/format-underscore.lsp
+++ b/format/format-underscore.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (def-ppblock-test format._.1
   (progn
diff --git a/format/format-x.lsp b/format/format-x.lsp
index 7c73b3bdeb2c5229bba1819dd7c1d0ee359dd875..5a45110dbba1a327474e20983dfcb776e01c76df 100644
--- a/format/format-x.lsp
+++ b/format/format-x.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (deftest format.x.1
   (let ((fn (formatter "~x")))
diff --git a/format/formatter-c.lsp b/format/formatter-c.lsp
index 7de05b17307d79a9edac085417692dbb89b1ab27..c61050da46fddda27e3ced07d906a5992d0c4be3 100644
--- a/format/formatter-c.lsp
+++ b/format/formatter-c.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (deftest formatter.c.1
   (let ((fn (formatter "~C")))
diff --git a/gclload1.lsp b/gclload1.lsp
index a362390d587e3900da32a2155c8586bb67acaad8..c903d643a37cda12584bdb66b0d17e2a0af6b29d 100644
--- a/gclload1.lsp
+++ b/gclload1.lsp
@@ -1,8 +1,8 @@
-#+:ecl (si::package-lock (find-package "COMMON-LISP") nil)
+#+ecl (si::package-lock (find-package "COMMON-LISP") nil)
+#+ecl (compile nil '(lambda () nil))
+#+ecl (setq c:*suppress-compiler-warnings* t c:*suppress-compiler-notes* t)
 #+:armedbear (require 'pprint)
-
 #+cmu (setq ext:*gc-verbose* nil)
-
 #+gcl (setq compiler:*suppress-compiler-notes* t
             compiler:*suppress-compiler-warnings* t
             compiler:*compile-verbose* nil
@@ -10,32 +10,31 @@
 
 #+lispworks (setq compiler::*compiler-warnings* nil)
 #+lispworks (make-echo-stream *standard-input* *standard-output*)
-
-#+ecl (compile nil '(lambda () nil))
-
-#+ecl (setq c:*suppress-compiler-warnings* t c:*suppress-compiler-notes* t)
-
 #+clisp (setq custom::*warn-on-floating-point-contagion* nil)
 
+;;; Configure logical pathnames
+(setf (logical-pathname-translations "ansi-tests")
+      `(("aux;*.*" ,(merge-pathnames
+                     "auxiliary/"
+                     (make-pathname
+                      :directory
+                      (pathname-directory *load-truename*))))))
+
 (let (*load-verbose* *load-print* *compile-verbose* *compile-print*)
   (load "compile-and-load.lsp"))
 
 (let (*load-verbose* *load-print* *compile-verbose* *compile-print*)
   (load "rt-package.lsp")
   (compile-and-load "rt.lsp")
-  ;; (unless (probe-file "rt.o") (compile-file "rt.lsp"))
-  ;; (load "rt.o")
   (load "cl-test-package.lsp")
   (in-package :cl-test)
-  (compile-and-load "ansi-aux-macros.lsp")
+  (compile-and-load "ANSI-TESTS:AUX;ansi-aux-macros.lsp")
   (handler-bind
    #-sbcl ()
    #+sbcl ((sb-ext:code-deletion-note #'muffle-warning))
    (load "universe.lsp"))
-  (compile-and-load "random-aux.lsp")
-  (compile-and-load "ansi-aux.lsp")
-  ;; (unless (probe-file "ansi-aux.o") (compile-file "ansi-aux.lsp"))
-  ;; (load "ansi-aux.o")
+  (compile-and-load "ANSI-TESTS:AUX;random-aux.lsp")
+  (compile-and-load "ANSI-TESTS:AUX;ansi-aux.lsp")
   
   (load "cl-symbol-names.lsp")
   (load "notes.lsp"))
diff --git a/load-arrays.lsp b/load-arrays.lsp
index 12919e168a3b97088dccfe465930db73d4797c46..764add642fb5529babbacc547c59c805e01d011f 100644
--- a/load-arrays.lsp
+++ b/load-arrays.lsp
@@ -1,5 +1,7 @@
 ;;; Tests on arrays
-(compile-and-load "array-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;array-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;bit-aux.lsp")
+
 (load "arrays/aref.lsp")
 (load "arrays/array.lsp")
 (load "arrays/array-t.lsp")
diff --git a/load-characters.lsp b/load-characters.lsp
index 6d559100481c367f4851c5b89c7f07937b67e547..eb132f16442c46a31f5d0f24d77d32f2616867b8 100644
--- a/load-characters.lsp
+++ b/load-characters.lsp
@@ -1,11 +1,6 @@
-;-*- Mode:     Lisp -*-
-;;;; Author:   Paul Dietz
-;;;; Created:  Thu Jun 23 20:12:44 2005
-;;;; Contains: Load character tests
+;;;; Character tests
+(compile-and-load "ANSI-TESTS:AUX;char-aux.lsp")
 
-(in-package :cl-test)
-
-(compile-and-load "char-aux.lsp")
 (load "characters/character.lsp")
 (load "characters/char-compare.lsp")
 (load "characters/name-char.lsp")
diff --git a/load-conditions.lsp b/load-conditions.lsp
index e83a8c6b02ac4a02826cc774db6746d3e288c1da..689a7aff9fc173e4379bbe37f298e930177723dd 100644
--- a/load-conditions.lsp
+++ b/load-conditions.lsp
@@ -1,6 +1,7 @@
 ;;; Tests of conditions
-(compile-and-load "types-aux.lsp")
-(compile-and-load "define-condition-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;types-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;define-condition-aux.lsp")
+
 (load "conditions/condition.lsp")
 (load "conditions/cell-error-name.lsp")
 (load "conditions/assert.lsp")
diff --git a/load-cons.lsp b/load-cons.lsp
index 3a891b11159284bdd80c0d6c7b0175dbb84af7f5..b32b1b7ba88f5fe9e38daf529e682da10b810389 100644
--- a/load-cons.lsp
+++ b/load-cons.lsp
@@ -1,6 +1,5 @@
 ;;; Tests of conses
-
-;;; (compile-and-load "cons-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;cons-aux.lsp")
 
 (load "cons/cons.lsp")
 (load "cons/consp.lsp")
diff --git a/load-data-and-control-flow.lsp b/load-data-and-control-flow.lsp
index c135aebf953e31d56dcbe40985ebf29936a57df4..a6fe6abb141d06a106abd4c1416b5efecfb83e88 100644
--- a/load-data-and-control-flow.lsp
+++ b/load-data-and-control-flow.lsp
@@ -1,4 +1,7 @@
 ;;; Tests of data and control flow
+(compile-and-load "ANSI-TESTS:AUX;cons-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;random-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;types-aux.lsp")
 
 (load "data-and-control-flow/data-and-control-flow.lsp")
 (load "data-and-control-flow/places.lsp")
diff --git a/load-hash-tables.lsp b/load-hash-tables.lsp
index 9edc95480dccdca40540f154c082267efdcd160f..ba218355bf01f3566052d0687d21158eecb67fbc 100644
--- a/load-hash-tables.lsp
+++ b/load-hash-tables.lsp
@@ -1,4 +1,4 @@
-(compile-and-load "hash-table-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;hash-table-aux.lsp")
 
 (load "hash-tables/hash-table.lsp")
 (load "hash-tables/make-hash-table.lsp")
diff --git a/load-iteration.lsp b/load-iteration.lsp
index a1bbc3aae4e44022ee6bdf80e089d1137cae253f..b326e87bb66520f0598a120f06a32238f09a977b 100644
--- a/load-iteration.lsp
+++ b/load-iteration.lsp
@@ -1,5 +1,5 @@
 ;;; Tests of iteration forms
-;;(load "iteration.lsp")
+
 (load "iteration/do.lsp")
 (load "iteration/dostar.lsp")
 (load "iteration/dolist.lsp")
diff --git a/load-numbers.lsp b/load-numbers.lsp
index d618f05fc9e0a7ddcb9b81877e96fb441db0a71e..6eb87fe6dcfd866ecdbf7fdba5acd6dba555805b 100644
--- a/load-numbers.lsp
+++ b/load-numbers.lsp
@@ -5,8 +5,21 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
-(compile-and-load "random-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;numbers-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;random-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;floor-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;ffloor-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;ceiling-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;fceiling-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;truncate-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;ftruncate-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;round-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;fround-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;times-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;division-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;exp-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;gcd-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;types-aux.lsp")
 
 (load "numbers/number-comparison.lsp")
 (load "numbers/max.lsp")
diff --git a/load-objects.lsp b/load-objects.lsp
index 533279fec5a3207e2a32f5ae54d583e6b91c8ad4..953d76984de15f38387dc7bd954baf98e16977a6 100644
--- a/load-objects.lsp
+++ b/load-objects.lsp
@@ -3,7 +3,8 @@
 ;;;; Created:  Mon Mar 24 03:39:09 2003
 ;;;; Contains: Loader for CLOS-related test files
 
-(compile-and-load "defclass-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;defclass-aux.lsp")
+
 (load "objects/defclass.lsp")
 (load "objects/defclass-01.lsp")
 (load "objects/defclass-02.lsp")
diff --git a/load-packages.lsp b/load-packages.lsp
index 9fcfb0a2fb02a645884e77f2d7ced3b150c14825..5464dddab97eb1582e2e3e0dba6c5d2d953eeec5 100644
--- a/load-packages.lsp
+++ b/load-packages.lsp
@@ -3,7 +3,9 @@
 ;;;; Created:  Sun Oct  6 00:32:56 2002
 ;;;; Contains: Loader for files containing package tests
 
-(compile-and-load "packages-00.lsp")
+(compile-and-load "ANSI-TESTS:AUX;packages00-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;package-aux.lsp")
+
 (load "packages/find-symbol.lsp")
 (load "packages/find-all-symbols.lsp")
 (load "packages/find-package.lsp")
diff --git a/load-pathnames.lsp b/load-pathnames.lsp
index a3fdf0ba1ee435b038969bc7f1e01fc35cbc7b37..114fb89bff01855b24b13c8db3c31282e10a402c 100644
--- a/load-pathnames.lsp
+++ b/load-pathnames.lsp
@@ -1,11 +1,5 @@
-;-*- Mode:     Lisp -*-
-;;;; Author:   Paul Dietz
-;;;; Created:  Sat Nov 29 04:33:05 2003
-;;;; Contains: Load tests for pathnames and logical pathnames
-
-(in-package :cl-test)
-
-(compile-and-load "pathnames-aux.lsp")
+;;;; Tests for pathnames and logical pathnames
+(compile-and-load "ANSI-TESTS:AUX;pathnames-aux.lsp")
 
 (load "pathnames/pathnames.lsp")
 (load "pathnames/pathname.lsp")
diff --git a/load-reader.lsp b/load-reader.lsp
index b0fad8cacaa506a56afa01c94a8f6fee95a2b9b6..f5975a7ddefb2060f740d02f9813f6140f5a2d78 100644
--- a/load-reader.lsp
+++ b/load-reader.lsp
@@ -1,9 +1,5 @@
-;-*- Mode:     Lisp -*-
-;;;; Author:   Paul Dietz
-;;;; Created:  Mon Feb 23 05:20:41 2004
-;;;; Contains: Load tests of the reader
-
-(in-package :cl-test)
+;;;; Tests of the reader
+(compile-and-load "ANSI-TESTS:AUX;reader-aux.lsp")
 
 (load "reader/reader-test.lsp")
 (load "reader/with-standard-io-syntax.lsp")
diff --git a/load-sequences.lsp b/load-sequences.lsp
index c819258215a560f85393681c6678960bdd855310..2b3841bdc5935b7fe3268e5085b98ef437016c64 100644
--- a/load-sequences.lsp
+++ b/load-sequences.lsp
@@ -1,4 +1,8 @@
 ;;; Tests of sequences
+(compile-and-load "ANSI-TESTS:AUX;search-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;subseq-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;remove-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;remove-duplicates-aux.lsp")
 
 (load "sequences/copy-seq.lsp")
 (load "sequences/elt.lsp")
diff --git a/load-strings.lsp b/load-strings.lsp
index 0e5a1f44deea96eb13b47a8350029437cb0fcad0..c0b4b1ab1a81908b7c56cd71cc295337e94ab15d 100644
--- a/load-strings.lsp
+++ b/load-strings.lsp
@@ -1,4 +1,5 @@
 ;;; Tests of strings
+(compile-and-load "ANSI-TESTS:AUX;string-aux.lsp")
 
 (load "strings/char-schar.lsp")
 (load "strings/string.lsp")
@@ -18,6 +19,5 @@
 (load "strings/string-right-trim.lsp")
 
 ;;; Tests of string comparison functions
-(compile-and-load "string-aux.lsp")
 (load "strings/string-comparisons.lsp")
 (load "strings/make-string.lsp")
diff --git a/load-symbols.lsp b/load-symbols.lsp
index 57f65acdada72f18840e387c81a4af0d1494a43b..6828552380525098399531efe8a244466804ae63 100644
--- a/load-symbols.lsp
+++ b/load-symbols.lsp
@@ -1,6 +1,6 @@
 ;;; Tests of symbols
-(compile-and-load "cl-symbols-aux.lsp")
-;; (load "cl-symbol-names.lsp")  ;; moved to gclload1.lsp
+(compile-and-load "ANSI-TESTS:AUX;cl-symbols-aux.lsp")
+
 (load "symbols/cl-symbols.lsp")
 (load "symbols/symbolp.lsp")
 (load "symbols/keywordp.lsp")
diff --git a/load-types-and-class.lsp b/load-types-and-class.lsp
index e54b593928f9eee939d54bbfb692c1551efa4cf2..35c1657fb9ceb24d321510561a16b1d6062f4201 100644
--- a/load-types-and-class.lsp
+++ b/load-types-and-class.lsp
@@ -1,4 +1,5 @@
 ;;; Tests of types and classes
+(compile-and-load "ANSI-TESTS:AUX;types-aux.lsp")
 
 (load "types-and-classes/types-and-class.lsp")
 (load "types-and-classes/types-and-class-2.lsp")
diff --git a/makefile b/makefile
index 6b56c1d84c7cdfa8a3b6fb713ef34f0892653752..3804e3a8c0b9b8baf3c2fffee28d719cb4c4f221 100644
--- a/makefile
+++ b/makefile
@@ -136,6 +136,7 @@ rt_1000_8:
 
 
 clean:
+	@rm -f auxiliary/*fas
 	@rm -f test*.out *.cls *.fasl *.o *.so *~ *.fn *.x86f *.fasl *.ufsl *.abcl *.fas *.lib \#*\#
 	@rm -f *.dfsl *.d64fsl
 	@(cd beyond-ansi; $(MAKE) clean)
diff --git a/numbers/abs.lsp b/numbers/abs.lsp
index ca0ddc114153b622a578d0339d537f0d99d7bf3b..f584efd9e57380db53d539c047243d901dbbe2b8 100644
--- a/numbers/abs.lsp
+++ b/numbers/abs.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 (deftest abs.error.1
   (signals-error (abs) program-error)
diff --git a/conditions/arithmetic-error.lsp b/numbers/arithmetic-error.lsp
similarity index 100%
rename from conditions/arithmetic-error.lsp
rename to numbers/arithmetic-error.lsp
diff --git a/numbers/boole.lsp b/numbers/boole.lsp
index 74fdac38f93a5cf6decb61898da32965dfb6a177..4cfadafb92d0910efecc0f1e265f9f2e6922b578 100644
--- a/numbers/boole.lsp
+++ b/numbers/boole.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 (defparameter *boole-val-names*
   '(boole-1 boole-2 boole-and boole-andc1 boole-andc2
diff --git a/numbers/ceiling.lsp b/numbers/ceiling.lsp
index 827b7850398cfac47c99568658cb5d168c8aac36..f83be0aca5e58b9442ac023a800e1f3fc3aa78a9 100644
--- a/numbers/ceiling.lsp
+++ b/numbers/ceiling.lsp
@@ -5,8 +5,8 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
-(compile-and-load "ceiling-aux.lsp")
+
+
 
 (deftest ceiling.error.1
   (signals-error (ceiling) program-error)
diff --git a/numbers/cis.lsp b/numbers/cis.lsp
index 456edea2e2a91dc4fc9065d790042d3e3c2f9b07..9ff8d22836aa1cac1d67d5a3bccfbefc95ca2b1d 100644
--- a/numbers/cis.lsp
+++ b/numbers/cis.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 (deftest cis.error.1
   (signals-error (cis) program-error)
diff --git a/numbers/decf.lsp b/numbers/decf.lsp
index 8a6b7da8f40c3dc1a6ceff673952d29b03f0abfa..32e53c3f9b66b52cce9571ca80ddd33cb14d60d3 100644
--- a/numbers/decf.lsp
+++ b/numbers/decf.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 (deftest decf.1
   (let ((x 12))
diff --git a/numbers/divide.lsp b/numbers/divide.lsp
index 9cb906ce99a98aba05bf36e01241a27e39ea2e04..4042004aa1acb6f4c9f53fad5d55b1a3669903b6 100644
--- a/numbers/divide.lsp
+++ b/numbers/divide.lsp
@@ -5,8 +5,8 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
-(compile-and-load "division-aux.lsp")
+
+
 
 (deftest /.error.1
   (signals-error (/) program-error)
diff --git a/numbers/epsilons.lsp b/numbers/epsilons.lsp
index 143dab834493dc6eb33071f89f2a16ddba78a6ae..24cc2ccd0af5b15b107173e61663c218a12fdf8d 100644
--- a/numbers/epsilons.lsp
+++ b/numbers/epsilons.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 (deftest epsilons.1
   (loop for e in (list short-float-epsilon single-float-epsilon
diff --git a/numbers/evenp.lsp b/numbers/evenp.lsp
index 3b75ca388f587306703fd57c27f33da7be0de765..aeeba3586fb5cdef36829eb41d32841d4111ab22 100644
--- a/numbers/evenp.lsp
+++ b/numbers/evenp.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 (deftest evenp.error.1
   (signals-error (evenp) program-error)
diff --git a/numbers/exp.lsp b/numbers/exp.lsp
index d0510a34fc9ee9723537493593a162f17f21cea7..ac7c669270412dee1f08181aebf89ec5fe3e5a8f 100644
--- a/numbers/exp.lsp
+++ b/numbers/exp.lsp
@@ -5,8 +5,8 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
-(compile-and-load "exp-aux.lsp")
+
+
 
 ;;; Error tests
 
diff --git a/numbers/fceiling.lsp b/numbers/fceiling.lsp
index 9577e5200d5c78e3f267a4365c153feea001b906..b4dd6295e915452d56b13bcd5c586baafcd2f449 100644
--- a/numbers/fceiling.lsp
+++ b/numbers/fceiling.lsp
@@ -5,8 +5,8 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
-(compile-and-load "fceiling-aux.lsp")
+
+
 
 (deftest fceiling.error.1
   (signals-error (fceiling) program-error)
diff --git a/numbers/ffloor.lsp b/numbers/ffloor.lsp
index ccb1a945a822a2128455e40928936ccd5e179e74..4b2596e863e85163e1d65e82528659e1ab40f070 100644
--- a/numbers/ffloor.lsp
+++ b/numbers/ffloor.lsp
@@ -5,8 +5,8 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
-(compile-and-load "ffloor-aux.lsp")
+
+
 
 (deftest ffloor.error.1
   (signals-error (ffloor) program-error)
diff --git a/numbers/floor.lsp b/numbers/floor.lsp
index 50828587ac53130f281772ba30770e510730075c..2e9a0fd6f9dbc875ac41995b279446810b4e4dab 100644
--- a/numbers/floor.lsp
+++ b/numbers/floor.lsp
@@ -5,8 +5,8 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
-(compile-and-load "floor-aux.lsp")
+
+
 
 ;;; Error tests
 
diff --git a/numbers/fround.lsp b/numbers/fround.lsp
index bdf2cd63ccc455e9c87231513a01814064309334..b22548bc9360116c18655d1746178103f3289258 100644
--- a/numbers/fround.lsp
+++ b/numbers/fround.lsp
@@ -5,8 +5,8 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
-(compile-and-load "fround-aux.lsp")
+
+
 
 ;;; Error tests
 
diff --git a/numbers/ftruncate.lsp b/numbers/ftruncate.lsp
index 07430943769bc647b7dde70c358e7367ac959082..c4bee25129981b9a34f955c96e16cb9ad6b1887a 100644
--- a/numbers/ftruncate.lsp
+++ b/numbers/ftruncate.lsp
@@ -5,8 +5,8 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
-(compile-and-load "ftruncate-aux.lsp")
+
+
 
 ;;; Error tests
 
diff --git a/numbers/gcd.lsp b/numbers/gcd.lsp
index 88a06a3a243cc92014d77552576294a476b13272..d89d9951b728073d82770e61c954eb56763dba9a 100644
--- a/numbers/gcd.lsp
+++ b/numbers/gcd.lsp
@@ -5,8 +5,8 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
-(compile-and-load "gcd-aux.lsp")
+
+
 
 ;;; Error tests
 
diff --git a/numbers/incf.lsp b/numbers/incf.lsp
index 427d4001643ce51a6a06fb368304f74f325831e5..b4f64a918e61c0b920123bf679a71936b111edd8 100644
--- a/numbers/incf.lsp
+++ b/numbers/incf.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 (deftest incf.1
   (let ((x 12))
diff --git a/numbers/isqrt.lsp b/numbers/isqrt.lsp
index eb3f66178ba5d96b50a69de683b879dc4a804499..d25c65f179bf34436d0ef01dc31525b785400dda 100644
--- a/numbers/isqrt.lsp
+++ b/numbers/isqrt.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 ;;; Error tests
 
diff --git a/numbers/lcm.lsp b/numbers/lcm.lsp
index 275abb74eb5072307cf550d0c50f02c76cede209..7a104c5b9e9788f2a5ba74ebd594c32f38ce5870 100644
--- a/numbers/lcm.lsp
+++ b/numbers/lcm.lsp
@@ -5,8 +5,8 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
-(compile-and-load "gcd-aux.lsp")
+
+
 
 (deftest lcm.error.1
   (check-type-error #'lcm #'integerp)
diff --git a/numbers/logand.lsp b/numbers/logand.lsp
index dc47ccc1da14141b42bc8b2c6fd82443236fefe5..d38fde00ddda6419b7117d70b0305a845cb8f432 100644
--- a/numbers/logand.lsp
+++ b/numbers/logand.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 ;;; Error tests
 
diff --git a/numbers/logandc1.lsp b/numbers/logandc1.lsp
index 295bdf15d4ad724e2ee6db6351a3cf2ef3f4d08a..d052d8388bc969d3c7e919f2086276f66a22e421 100644
--- a/numbers/logandc1.lsp
+++ b/numbers/logandc1.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 ;;; Error tests
 
diff --git a/numbers/logandc2.lsp b/numbers/logandc2.lsp
index 8bef40f41cb65017d573b03eb2bcba10e36c51aa..4712b221104b612791ac17f0682385cccecf2622 100644
--- a/numbers/logandc2.lsp
+++ b/numbers/logandc2.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 ;;; Error tests
 
diff --git a/numbers/logbitp.lsp b/numbers/logbitp.lsp
index c2d0d9d4320af2a8b70088c58198019f98333083..dfd4fe6b81f4b668b456029695b77c374085d4f8 100644
--- a/numbers/logbitp.lsp
+++ b/numbers/logbitp.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 ;;; Error tests
 
diff --git a/numbers/logeqv.lsp b/numbers/logeqv.lsp
index b28c2160fb854a3bc083cab5eb6ae9abb523c779..b06a0a8dbd2322eba9dea374af4bd198318ee19b 100644
--- a/numbers/logeqv.lsp
+++ b/numbers/logeqv.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 ;;; Error tests
 
diff --git a/numbers/logior.lsp b/numbers/logior.lsp
index 317c4406576a6ecca68948c49391f0b82a642d0f..4ebca6dfe3f11ba9ce62bbc156835dab1434cc02 100644
--- a/numbers/logior.lsp
+++ b/numbers/logior.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 ;;; Error tests
 
diff --git a/numbers/lognand.lsp b/numbers/lognand.lsp
index ca4dabdc263b0671716a17c2aa687f8aec4b0a81..d0c81b28d19ddffe8ec90a8aab674b193058045f 100644
--- a/numbers/lognand.lsp
+++ b/numbers/lognand.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 ;;; Error tests
 
diff --git a/numbers/lognor.lsp b/numbers/lognor.lsp
index 9c978f5828e9b3b6a0466627c9f2c620d9027cb4..aa4dddaf77095ce4152901bc27d4f8961379dda6 100644
--- a/numbers/lognor.lsp
+++ b/numbers/lognor.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 ;;; Error tests
 
diff --git a/numbers/lognot.lsp b/numbers/lognot.lsp
index ef41c1469daba0a9477d5698ac47fc96f4ef145b..00e7ec7dc5bb551532f02b6f9aba4021aca4951d 100644
--- a/numbers/lognot.lsp
+++ b/numbers/lognot.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 ;;; Error tests
 
diff --git a/numbers/logorc1.lsp b/numbers/logorc1.lsp
index 211d3dcc3b8bfc5e554f32100b12309427a10947..294413cd092e11d153f607220b5454e4b556af3c 100644
--- a/numbers/logorc1.lsp
+++ b/numbers/logorc1.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 ;;; Error tests
 
diff --git a/numbers/logorc2.lsp b/numbers/logorc2.lsp
index 116ba4b3ebc7c1ffe71c19d071f8ea52511d1ada..d5053ec0232392d2d519ccd269fdecc57b5aa59f 100644
--- a/numbers/logorc2.lsp
+++ b/numbers/logorc2.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 ;;; Error tests
 
diff --git a/numbers/logxor.lsp b/numbers/logxor.lsp
index 271edb5e433e906d7d6ac37875fa70f35c61fd1f..cb7b1274a1d9eefade3f8b04f63bb84b1263200f 100644
--- a/numbers/logxor.lsp
+++ b/numbers/logxor.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 ;;; Error tests
 
diff --git a/numbers/max.lsp b/numbers/max.lsp
index 924a13013c00328da0ebfdb25f57f90ab36b875f..e70bc08a4423ed3289ccf30b7bc439bdbc275a5c 100644
--- a/numbers/max.lsp
+++ b/numbers/max.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 ;;; Error tests
 
diff --git a/numbers/min.lsp b/numbers/min.lsp
index e5a88dfc60f4f42607ac1b8cbb3be4ed20f77106..8ad55904f5ef102d21aadd552795125f84a4fe27 100644
--- a/numbers/min.lsp
+++ b/numbers/min.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 (deftest min.error.1
   (signals-error (min) program-error)
diff --git a/numbers/minus.lsp b/numbers/minus.lsp
index 865b26250fde0bf480db2572fa54e284d41a471e..0dd4e4bfafb82a86b43bbd462dab4315315d1761 100644
--- a/numbers/minus.lsp
+++ b/numbers/minus.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 (deftest minus.error.1
   (signals-error (-) program-error)
diff --git a/numbers/number-comparison.lsp b/numbers/number-comparison.lsp
index 20830b5686c6e901a44656b032889da80a5805f7..e558b49e24154d723214cdc97ce53838330e0378 100644
--- a/numbers/number-comparison.lsp
+++ b/numbers/number-comparison.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 ;;; Errors tests on comparison functions
 
diff --git a/numbers/numerator-denominator.lsp b/numbers/numerator-denominator.lsp
index 7f487b17f1bb43ca878fecdf649a1dfdbe43bf84..7e3b186ceb093bec54b544984ccec836cf3f2dab 100644
--- a/numbers/numerator-denominator.lsp
+++ b/numbers/numerator-denominator.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 (deftest numerator.error.1
   (signals-error (numerator) program-error)
diff --git a/numbers/oddp.lsp b/numbers/oddp.lsp
index 8fd3ec429826e19e971278d77df26d0d974f5401..3b4eaf2d02b586d334007a7d26953d419efd6747 100644
--- a/numbers/oddp.lsp
+++ b/numbers/oddp.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 ;;; Error tests
 
diff --git a/numbers/oneminus.lsp b/numbers/oneminus.lsp
index afac16ee5c8b27ad84ed8339099a20f438601020..d99c730a68fc9459e98917d26e6b7f22b6e23dea 100644
--- a/numbers/oneminus.lsp
+++ b/numbers/oneminus.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 ;;; Error tests
 
diff --git a/numbers/oneplus.lsp b/numbers/oneplus.lsp
index 0646df8e136aaba87f1764eea7d5fb524f7abc4a..7b555d6f36f9a39f594f1409909220c08a0546c9 100644
--- a/numbers/oneplus.lsp
+++ b/numbers/oneplus.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 (deftest 1+.error.1
   (signals-error (1+) program-error)
diff --git a/numbers/plus.lsp b/numbers/plus.lsp
index 869c76d13f536f388108cd4b345184232575357c..bf11e31a3b23ce22fc799416ea341b05a8019b3e 100644
--- a/numbers/plus.lsp
+++ b/numbers/plus.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 ;;; (compile-and-load "plus-aux.lsp")
 
 (deftest plus.1
diff --git a/numbers/random.lsp b/numbers/random.lsp
index 2f5df06ecd2058dac2c86f7f91300f1d6ec275e3..c9b2cbe8a611a397df7bd199bb67dcdb3f3f45c2 100644
--- a/numbers/random.lsp
+++ b/numbers/random.lsp
@@ -5,8 +5,8 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
-(compile-and-load "random-aux.lsp")
+
+
 
 (deftest random.error.1
   (signals-error (random) program-error)
diff --git a/numbers/round.lsp b/numbers/round.lsp
index 94668a25d02775bc91d1c7b0788b2b159b0defef..bbef136dab03b5c75e54279f0a6c1004bc1e46f6 100644
--- a/numbers/round.lsp
+++ b/numbers/round.lsp
@@ -5,8 +5,8 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
-(compile-and-load "round-aux.lsp")
+
+
 
 (deftest round.error.1
   (signals-error (round) program-error)
diff --git a/numbers/sqrt.lsp b/numbers/sqrt.lsp
index 2e8a0ff3bc2ca9b0e3ff3fbf8328f51813846ebe..a085f6032b88b04a82ab4431e67ca8d94850a250 100644
--- a/numbers/sqrt.lsp
+++ b/numbers/sqrt.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
+
 
 (deftest sqrt.error.1
   (signals-error (sqrt) program-error)
diff --git a/numbers/times.lsp b/numbers/times.lsp
index 22c10f2f5cba854ebc9a145a93a687f009375659..21ededbda4909436c008cd2d23ca3fdf21695ad1 100644
--- a/numbers/times.lsp
+++ b/numbers/times.lsp
@@ -5,8 +5,8 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
-(compile-and-load "times-aux.lsp")
+
+
 
 (deftest *.1
   (*)
diff --git a/numbers/truncate.lsp b/numbers/truncate.lsp
index 40b2e09eb336b8261d5aea5b8d42b7a37b9262e7..9222fec24f205f01f039f88c62512d561177e87a 100644
--- a/numbers/truncate.lsp
+++ b/numbers/truncate.lsp
@@ -5,8 +5,8 @@
 
 (in-package :cl-test)
 
-(compile-and-load "numbers-aux.lsp")
-(compile-and-load "truncate-aux.lsp")
+
+
 
 (deftest truncate.error.1
   (signals-error (truncate) program-error)
diff --git a/numbers/upgraded-complex-part-type.lsp b/numbers/upgraded-complex-part-type.lsp
index b39fc32834e570b18e37ee45f9aaf8559dc80b35..addc61fd6b5c795bc89c561112c15dc7ce9c2384 100644
--- a/numbers/upgraded-complex-part-type.lsp
+++ b/numbers/upgraded-complex-part-type.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "types-aux.lsp")
+
 
 (defmacro def-ucpt-test (name types)
   `(deftest ,name
diff --git a/packages/defpackage.lsp b/packages/defpackage.lsp
index e46958bef00309e1ba47e118ec4dfbe9627eb303..6525bc2c6a73bcd129eb363c93be61cede647294 100644
--- a/packages/defpackage.lsp
+++ b/packages/defpackage.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "package-aux.lsp")
+
 
 (declaim (optimize (safety 3)))
 
diff --git a/packages/do-external-symbols.lsp b/packages/do-external-symbols.lsp
index 41f2c631ad4b138ec18550ff9b5b35b8f1f30b76..16b827aa997f5467acef241d0dd279b12bceb9eb 100644
--- a/packages/do-external-symbols.lsp
+++ b/packages/do-external-symbols.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "package-aux.lsp")
+
 
 (declaim (optimize (safety 3)))
 
diff --git a/packages/do-symbols.lsp b/packages/do-symbols.lsp
index 947cd4965c9d3ae802c3bf03ce791e55b65df2c7..4cdb340ed4fecc3d6745fdc5cd08b94035182ce2 100644
--- a/packages/do-symbols.lsp
+++ b/packages/do-symbols.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "package-aux.lsp")
+
 
 (declaim (optimize (safety 3)))
 
diff --git a/packages/find-symbol.lsp b/packages/find-symbol.lsp
index 59544757a60a4887e8c0af36c8b37637701f4a0d..303f51ea8001b00b43395a2a87ccd30e57258354 100644
--- a/packages/find-symbol.lsp
+++ b/packages/find-symbol.lsp
@@ -5,8 +5,6 @@
 
 (in-package :cl-test)
 
-(compile-and-load "packages-00.lsp")
-
 ;;(declaim (optimize (safety 3)))
 
 ;; Test find-symbol, with the various combinations of
diff --git a/packages/import.lsp b/packages/import.lsp
index 43dabf519820c093dd6d743e5e448e08da25bf0b..e430dc55624426344048c3565fcef86fb871f988 100644
--- a/packages/import.lsp
+++ b/packages/import.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "package-aux.lsp")
+
 
 ;;; Create a package name that does not collide with an existing package
 ;;; name or nickname
diff --git a/packages/unuse-package.lsp b/packages/unuse-package.lsp
index 30fdf86c3d7df5d5d2f51c38eaef312b63846b5d..b0b0bb1c6931851e775fa7650e53c218b22e0bc6 100644
--- a/packages/unuse-package.lsp
+++ b/packages/unuse-package.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "package-aux.lsp")
+
 
 (declaim (optimize (safety 3)))
 
diff --git a/packages/use-package.lsp b/packages/use-package.lsp
index 23a8f9a2d9af4b47a0b3f013924e9e331f920100..09f47da4460fa3e65847bc686e128ac154a2eaad 100644
--- a/packages/use-package.lsp
+++ b/packages/use-package.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "package-aux.lsp")
+
 
 (declaim (optimize (safety 3)))
 
diff --git a/packages/with-package-iterator.lsp b/packages/with-package-iterator.lsp
index 810549284300a81ef862b40da6ed245731ab3a2f..514667e1afa7cc13cd82480f1aba17773772313c 100644
--- a/packages/with-package-iterator.lsp
+++ b/packages/with-package-iterator.lsp
@@ -6,7 +6,7 @@
 (in-package :cl-test)
 (declaim (optimize (safety 3)))
 
-(compile-and-load "package-aux.lsp")
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; with-package-iterator
diff --git a/pathnames/pathname-device.lsp b/pathnames/pathname-device.lsp
index cd87f9c49b1d7f1a1490d1a8ea18258a25b7ea5c..621719b64f2da4e1763f6326a96c98f1a3569d65 100644
--- a/pathnames/pathname-device.lsp
+++ b/pathnames/pathname-device.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "pathnames-aux.lsp")
+
 
 (deftest pathname-device.1
   (loop for p in *pathnames*
diff --git a/pathnames/pathname-directory.lsp b/pathnames/pathname-directory.lsp
index 0871e89244088b85c5bd77069da66a9f6bb17d28..694d796681699ba5691e6fdfbc4fdfb6ac95c54a 100644
--- a/pathnames/pathname-directory.lsp
+++ b/pathnames/pathname-directory.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "pathnames-aux.lsp")
+
 
 (deftest pathname-directory.1
   (loop for p in *pathnames*
diff --git a/pathnames/pathname-host.lsp b/pathnames/pathname-host.lsp
index 2ed903069757284b6d16eb703490ef81e8adcbce..a347376655112e95d280ce194528938efd63d778 100644
--- a/pathnames/pathname-host.lsp
+++ b/pathnames/pathname-host.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "pathnames-aux.lsp")
+
 
 (deftest pathname-host.1
   (loop for p in *pathnames*
diff --git a/pathnames/pathname-match-p.lsp b/pathnames/pathname-match-p.lsp
index 8e0ff8eb00cc316edec3dab02bca6caca7fbb98a..2df133a2b1d0f039ae11dd830adf3f7d043cee54 100644
--- a/pathnames/pathname-match-p.lsp
+++ b/pathnames/pathname-match-p.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "pathnames-aux.lsp")
+
 
 ;;; Much of the behavior cannot be tested portably.
 
diff --git a/pathnames/pathname-name.lsp b/pathnames/pathname-name.lsp
index 027ffbae51c202812da13f6d58cf0198329e2d08..2ce7d1ebb92df7f4b0fea96b8ac636809557dce3 100644
--- a/pathnames/pathname-name.lsp
+++ b/pathnames/pathname-name.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "pathnames-aux.lsp")
+
 
 (deftest pathname-name.1
   (loop for p in *pathnames*
diff --git a/pathnames/pathname-type.lsp b/pathnames/pathname-type.lsp
index e8c5083b6374f639733ffda152bebeb5039faa95..b08766aa5c847481198477e8d4aac26292492f1b 100644
--- a/pathnames/pathname-type.lsp
+++ b/pathnames/pathname-type.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "pathnames-aux.lsp")
+
 
 (deftest pathname-type.1
   (loop for p in *pathnames*
diff --git a/pathnames/pathname-version.lsp b/pathnames/pathname-version.lsp
index 5cc77db51c92239a2ddd579c8d4f5da3e276007b..3dc83b1f0fe5945216b236d70f86bb1c2eed17f1 100644
--- a/pathnames/pathname-version.lsp
+++ b/pathnames/pathname-version.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "pathnames-aux.lsp")
+
 
 (deftest pathname-version.1
   (loop for p in *pathnames*
diff --git a/pathnames/wild-pathname-p.lsp b/pathnames/wild-pathname-p.lsp
index 3f9a302166940127b1f518951ff3f9833bfaf48e..72a4228cd9a3d08eb54c2d27797d00a62137b1f3 100644
--- a/pathnames/wild-pathname-p.lsp
+++ b/pathnames/wild-pathname-p.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "pathnames-aux.lsp")
+
 
 (deftest wild-pathname-p.1
   (wild-pathname-p (make-pathname))
diff --git a/printer/pprint-newline.lsp b/printer/pprint-newline.lsp
index e7295537f43ed42dac989abad801c69d7f651396..bc77f2befd39f4be62bd9f8b0d63cf081c8d5dfd 100644
--- a/printer/pprint-newline.lsp
+++ b/printer/pprint-newline.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (defmacro def-pprint-newline-test (name form expected-value &rest key-args)
   `(def-pprint-test ,name
diff --git a/printer/pprint-tab.lsp b/printer/pprint-tab.lsp
index 085e3c7166604771181dff4ba4353406f1ade056..5eca2f15f5520e1ea5f79bb14d4a407760537e56 100644
--- a/printer/pprint-tab.lsp
+++ b/printer/pprint-tab.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 ;;; No effect in a non-pprint stream
 
diff --git a/printer/pprint.lsp b/printer/pprint.lsp
index 15edabd36b4f0d024d41fe4e2c0aa5f4d5ed9e64..25bd1d30fc6199c104fbb8f69fc914ffed9543f9 100644
--- a/printer/pprint.lsp
+++ b/printer/pprint.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 ;;; This function is mostly tested elsewhere
 
diff --git a/printer/prin1-to-string.lsp b/printer/prin1-to-string.lsp
index 6e950f7ac8f77e0fb2ce802a87fd5bca8f73d437..aba16db4272ca5de5bd34e8142936536a0a9bb1e 100644
--- a/printer/prin1-to-string.lsp
+++ b/printer/prin1-to-string.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (deftest prin1-to-string.1
   (random-prin1-to-string-test 5)
diff --git a/printer/prin1.lsp b/printer/prin1.lsp
index 26d12c04caca8f417caac4bf6134e0c31265369b..8dd77ab15ac62d6227928bc6a94d1083ac75c7b4 100644
--- a/printer/prin1.lsp
+++ b/printer/prin1.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 ;;; This function is mostly tested elsewhere
 
diff --git a/printer/princ-to-string.lsp b/printer/princ-to-string.lsp
index 3a3171737186fb4ec3261289470635e84bd9819e..5276f040aa20fdc846221b5f76848bc3ee860c71 100644
--- a/printer/princ-to-string.lsp
+++ b/printer/princ-to-string.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (deftest princ-to-string.1
   (random-princ-to-string-test 1000)
diff --git a/printer/princ.lsp b/printer/princ.lsp
index 84b1578f9b16f23eb63dd3694f5c41dc652155c1..fd0edb630b63801034a9b9be8116395f93e3c3c9 100644
--- a/printer/princ.lsp
+++ b/printer/princ.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 ;;; This function is mostly tested elsewhere
 
diff --git a/printer/print-array.lsp b/printer/print-array.lsp
index ab93657b278da5ec7fd7ebf163e545325a08dc05..2f0f2f9e889e29bedb8e07a3d37cb3a893ada9d1 100644
--- a/printer/print-array.lsp
+++ b/printer/print-array.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Apr 22 22:38:11 2004
 ;;;; Contains: Tests of printing of arrays (other than vectors)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (in-package :cl-test)
 
diff --git a/printer/print-backquote.lsp b/printer/print-backquote.lsp
index 331ea940ea671b260512ca5a962160e2971a8493..ca282b0201f0be45690e3c1dce3274125f0bec05 100644
--- a/printer/print-backquote.lsp
+++ b/printer/print-backquote.lsp
@@ -5,8 +5,8 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
-(compile-and-load "backquote-aux.lsp")
+
+
 
 (deftest print.backquote.random.1
   (let* ((x '`(a ,b ,@c (d . ,e) ,.f #(1 2 ,p ,@q ,.r s) g))
diff --git a/printer/print-bit-vector.lsp b/printer/print-bit-vector.lsp
index 5e704db4802a0fca40db3cf9338a918202fd19a7..1ea931ac1b50585e8df889aaee4b7b3217afb7a7 100644
--- a/printer/print-bit-vector.lsp
+++ b/printer/print-bit-vector.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Apr 20 22:10:53 2004
 ;;;; Contains: Tests for printing of bit vectors
 
-(compile-and-load "printer-aux.lsp")
+
 
 (in-package :cl-test)
 
diff --git a/printer/print-characters.lsp b/printer/print-characters.lsp
index c220e2406674cdbed01cf024477aa6d4564c9647..5e70be54b1b1dd90f6a8229a2916ab4ab4b3d14e 100644
--- a/printer/print-characters.lsp
+++ b/printer/print-characters.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 ;;; See CLtS section 22.1.3.2, "Printing Characters"
 
diff --git a/printer/print-complex.lsp b/printer/print-complex.lsp
index 956fcc4d9ca87817de36d3f798d4740edc3e0c60..bfab48dadf0a23064fb57be2d04899b65ea839fe 100644
--- a/printer/print-complex.lsp
+++ b/printer/print-complex.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (deftest print.complex.1
   (equalt
diff --git a/printer/print-cons.lsp b/printer/print-cons.lsp
index 7d9b77a8523eeb541f2a4cf28e2bcd6d30ad13ae..8327ee10b975694efdccf589f47106f9882aecc1 100644
--- a/printer/print-cons.lsp
+++ b/printer/print-cons.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Apr 19 07:28:40 2004
 ;;;; Contains: Tests of printing of conses
 
-(compile-and-load "printer-aux.lsp")
+
 
 (in-package :cl-test)
 
diff --git a/printer/print-floats.lsp b/printer/print-floats.lsp
index 81869ba115171bffe717bb21736dd8778445bd4b..dfabc8308f844421d41fed1030efe53ea964247b 100644
--- a/printer/print-floats.lsp
+++ b/printer/print-floats.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (deftest print.short-float.1
   (with-standard-io-syntax
diff --git a/printer/print-integers.lsp b/printer/print-integers.lsp
index aa62498e90c14508884a9c56abd963b9fba05146..b6eaf89837825b3165fbcab43679269d4303dec4 100644
--- a/printer/print-integers.lsp
+++ b/printer/print-integers.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 ;;; Tests with *print-base*
 
diff --git a/printer/print-length.lsp b/printer/print-length.lsp
index b513d40dcd51d6dff5b3f3b6a4e2c0c70f7b8e1f..4b65e397c623a547a5ae97d3fd122164cd40c12b 100644
--- a/printer/print-length.lsp
+++ b/printer/print-length.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (def-print-test print-length.1
   '(1)
diff --git a/printer/print-level.lsp b/printer/print-level.lsp
index 841af68e18a5ce92ad212b2db41f1f1c86786445..4e7721f182dd7fd7520106130a365bafdf14e699 100644
--- a/printer/print-level.lsp
+++ b/printer/print-level.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 #|
 (deftest print-level.1
diff --git a/printer/print-pathname.lsp b/printer/print-pathname.lsp
index 6baa9825da77907652262d12e29181be4271456f..ee3f46a4d8e08568d5dc089a3bdf4e1fe94acf8c 100644
--- a/printer/print-pathname.lsp
+++ b/printer/print-pathname.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (deftest print.pathname.1
   (loop for p in *universe*
diff --git a/printer/print-random-state.lsp b/printer/print-random-state.lsp
index 5ba76963b39332ac3d5d0810322be24b5eee9fa8..2ad5533d2a2f1d6229f9303175ea09fcf27796c9 100644
--- a/printer/print-random-state.lsp
+++ b/printer/print-random-state.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (deftest print.random-state.1
   (loop repeat 100
diff --git a/printer/print-ratios.lsp b/printer/print-ratios.lsp
index 4d42c6c2886d6b9df044e2939cb10741b509122c..b420f4f61be59e512a221e6d665dc771b849f97c 100644
--- a/printer/print-ratios.lsp
+++ b/printer/print-ratios.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (deftest print.ratios.random
   (loop for i from 1 to 1000
diff --git a/printer/print-strings.lsp b/printer/print-strings.lsp
index 0c8ba3eb4b26756f62aa80edf02d703e86fe489c..f299e5df8bf7ca6b73c95c026fa95aa4ba1310c2 100644
--- a/printer/print-strings.lsp
+++ b/printer/print-strings.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (deftest print.string.1
   (with-standard-io-syntax
diff --git a/printer/print-structure.lsp b/printer/print-structure.lsp
index d3b159278a69da196494569c276c86decf21c298..82cdd2b74ff7bad1784a4772c442fba56fb807ea 100644
--- a/printer/print-structure.lsp
+++ b/printer/print-structure.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (defstruct print-struct-1
   foo bar)
diff --git a/printer/print-symbols.lsp b/printer/print-symbols.lsp
index 401e7a6bac710ef0e58d2a61fd129562007e2185..b7351cd6dd3cf1083d1bae25def2ed28424330a5 100644
--- a/printer/print-symbols.lsp
+++ b/printer/print-symbols.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 ;;; Symbol printing when escaping is off
 
diff --git a/printer/print-unreadable-object.lsp b/printer/print-unreadable-object.lsp
index ab74b4e745997131288c69019c9eaa22038b1340..6b83c6a8dac13b05c40ffcea978e25dc1deee0a9 100644
--- a/printer/print-unreadable-object.lsp
+++ b/printer/print-unreadable-object.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 (def-pprint-test print-unreadable-object.1
   (loop
diff --git a/printer/print-vector.lsp b/printer/print-vector.lsp
index 4798fec9e8f87a130c7b5c4500ab137f80d1e696..4ff50ac98b06031f7594d900e64857758bbb16d8 100644
--- a/printer/print-vector.lsp
+++ b/printer/print-vector.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Apr 20 22:36:53 2004
 ;;;; Contains: Tests of vector printing
 
-(compile-and-load "printer-aux.lsp")
+
 
 (in-package :cl-test)
 
diff --git a/printer/print.lsp b/printer/print.lsp
index 5f71bcdec0ad2051158bee6f7edf6f1cb3a3bf8a..dac56e76e5a1ab0128dfb6399a0cf3dbe8eb98d1 100644
--- a/printer/print.lsp
+++ b/printer/print.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 ;;; This function is mostly tested elsewhere
 
diff --git a/printer/write-to-string.lsp b/printer/write-to-string.lsp
index c324c44b04ac4d50d922bd1c3c4170d1ce995cd6..2832cb35ae1e6e4a5044f806ccda4893e0b9e674 100644
--- a/printer/write-to-string.lsp
+++ b/printer/write-to-string.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 
 ;;; This function is extensively used elsewhere
 
diff --git a/printer/write.lsp b/printer/write.lsp
index de516651c0a88c7cb373f4f15810eda26d4a99aa..23cb1052863a81accdb17b64ca3c6a350f56b58a 100644
--- a/printer/write.lsp
+++ b/printer/write.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "printer-aux.lsp")
+
 ;; (compile-and-load "write-aux.lsp")
 
 ;;; This function is also incidentally tested elsewhere.
diff --git a/rctest/load.lsp b/rctest/load.lsp
index 69841eb35b6ae6ecf3c9a7c39251e91bb4bebdfe..16867853a1db66539c0fa6d72ba246ca88d58127 100644
--- a/rctest/load.lsp
+++ b/rctest/load.lsp
@@ -4,7 +4,7 @@
 (load "../rt-package.lsp")
 (compile-and-load "../rt.lsp")
 (load "../cl-test-package.lsp")
-(compile-and-load "../random-aux.lsp")
+(compile-and-load "ANSI-TESTS:AUX;random-aux.lsp")
 (load "rctest-package.lsp")
 (compile-and-load "rctest-util.lsp")
 (compile-and-load "generator.lsp")
diff --git a/reader/get-macro-character.lsp b/reader/get-macro-character.lsp
index c6d04bf8e859e16c05e035bcb31f83be63734a19..4f7d7c8f0a9ba7b4e8499416173c1b8e788b1e7b 100644
--- a/reader/get-macro-character.lsp
+++ b/reader/get-macro-character.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "reader-aux.lsp")
+
 
 (def-syntax-test get-macro-character.1
   (loop for c across "()';\"`,#"
diff --git a/reader/read-suppress.lsp b/reader/read-suppress.lsp
index db1ea6ab44752b935b099831f7ef1c45a6767d7f..e00a78cf44757329e342ef964426dbdc7d84d7be 100644
--- a/reader/read-suppress.lsp
+++ b/reader/read-suppress.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "reader-aux.lsp")
+
 
 (defmacro def-read-suppress-test (name string)
   `(def-syntax-test ,name
diff --git a/reader/reader-test.lsp b/reader/reader-test.lsp
index b3d63582f4dbedee41b7e7a37d0c2f2160a12a1c..9537ba96de1d759616706fbc3e0edc181c0a9c9d 100644
--- a/reader/reader-test.lsp
+++ b/reader/reader-test.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "reader-aux.lsp")
+
 
 (def-syntax-test read-symbol.1
   (read-from-string "a")
diff --git a/reader/set-syntax-from-char.lsp b/reader/set-syntax-from-char.lsp
index 90f3ecec7785a6f1b1cf80d19919a9755a17fb62..d1d038158eda9673acad82b4656346efbe890977 100644
--- a/reader/set-syntax-from-char.lsp
+++ b/reader/set-syntax-from-char.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "reader-aux.lsp")
+
 
 (defmacro def-set-syntax-from-char-test (name form &body expected-values)
   `(deftest ,name
diff --git a/reader/syntax-tokens.lsp b/reader/syntax-tokens.lsp
index debfd0e487e9ee78af63f7b1ad88ae42af6816c2..c41c6c6bbf3a8b55260714498ec40dac5c7dfc5c 100644
--- a/reader/syntax-tokens.lsp
+++ b/reader/syntax-tokens.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "reader-aux.lsp")
+
 
 ;; Erroneous numbers
 
diff --git a/reader/syntax.lsp b/reader/syntax.lsp
index d8f6a79a7aff4301e67f73f0e0e4eafd6c78338c..8835a447ba57b528ddd8facab80bd2b1593c321b 100644
--- a/reader/syntax.lsp
+++ b/reader/syntax.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "reader-aux.lsp")
+
 
 (def-syntax-test syntax.whitespace.1
   ;; Check that various standard or semistandard characters are whitespace[2]
diff --git a/sequences/remove-duplicates.lsp b/sequences/remove-duplicates.lsp
index 51b041f010970b19a7e575d9001531ca27bc4ed5..df3113fcab51923e2474e31c6d44a3c5a4826002 100644
--- a/sequences/remove-duplicates.lsp
+++ b/sequences/remove-duplicates.lsp
@@ -5,8 +5,8 @@
 
 (in-package :cl-test)
 
-(compile-and-load "remove-aux.lsp")
-(compile-and-load "remove-duplicates-aux.lsp")
+
+
 
 (deftest random-remove-duplicates
   (loop for result = (random-test-remove-dups (1+ (random 20)))
diff --git a/sequences/remove.lsp b/sequences/remove.lsp
index bb6f9337b4e4816321902320c478716028e96269..57ff5689e582e4db3502456a53da588f4f0bd160 100644
--- a/sequences/remove.lsp
+++ b/sequences/remove.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Sep 14 11:46:05 2002
 ;;;; Contains: Tests for REMOVE
 
-(compile-and-load "remove-aux.lsp")
+
 
 (in-package :cl-test)
 
diff --git a/sequences/search-bitvector.lsp b/sequences/search-bitvector.lsp
index 404fdbaf15455ee9b24b44862740faa0dec93574..cddf53a5bd78a35a90c4bcf544b27deaf618fc93 100644
--- a/sequences/search-bitvector.lsp
+++ b/sequences/search-bitvector.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "search-aux.lsp")
+
 
 (deftest search-bitvector.1
   (let ((target *searched-bitvector*)
diff --git a/sequences/search-list.lsp b/sequences/search-list.lsp
index 2f57c063f50a39e8013e1fc2ed42940b6ae8eee1..c75d7f09de9ed122612d0f939223cb365966522f 100644
--- a/sequences/search-list.lsp
+++ b/sequences/search-list.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "search-aux.lsp")
+
 
 (deftest search-list.1
   (let ((target *searched-list*)
diff --git a/sequences/search-string.lsp b/sequences/search-string.lsp
index c498395b6ba436937a55655335e13c034eff27fc..3c88a50749a0035397fe439753b20d3408ffc3e1 100644
--- a/sequences/search-string.lsp
+++ b/sequences/search-string.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "search-aux.lsp")
+
 
 ;;; The next test was busted due to to a stupid cut and paste
 ;;; error.  The loop terminates immediately, doing nothing
diff --git a/sequences/search-vector.lsp b/sequences/search-vector.lsp
index d441c35a4479e54c357155ce608c179c533931a7..4f1258829ae18095bb9008f054262d7a2dbc0093 100644
--- a/sequences/search-vector.lsp
+++ b/sequences/search-vector.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "search-aux.lsp")
+
 
 (deftest search-vector.1
   (let ((target *searched-vector*)
diff --git a/sequences/subseq.lsp b/sequences/subseq.lsp
index 525d06d140a68ea1dae3391c2463cd1d03c6fb9a..147f4e1140ca5425a6e1dfd13e618371f262a9f8 100644
--- a/sequences/subseq.lsp
+++ b/sequences/subseq.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "subseq-aux.lsp")
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; subseq, on lists
diff --git a/strings/string-comparisons.lsp b/strings/string-comparisons.lsp
index e66c149c34a4593af0d5e216abb58fc6e7fc4958..2035803c42b4f7e98b04e71662b39df5385193eb 100644
--- a/strings/string-comparisons.lsp
+++ b/strings/string-comparisons.lsp
@@ -5,8 +5,6 @@
 
 (in-package :cl-test)
 
-(compile-and-load "string-aux.lsp")
-
 (deftest string=.1
   (not (string= "abc" (copy-seq "abc")))
   nil)
diff --git a/types-and-classes/deftype.lsp b/types-and-classes/deftype.lsp
index acc218bae9726b4120ca5a509128edea36065c0e..43b555f4831af9ed2dba2a05327a203b9d2d8cea 100644
--- a/types-and-classes/deftype.lsp
+++ b/types-and-classes/deftype.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "types-aux.lsp")
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; deftype
diff --git a/types-and-classes/subtypep-array.lsp b/types-and-classes/subtypep-array.lsp
index 341b0506a0d30eb5a7e75732fe0e44171d3509d3..fcfdcec4f8e776034b26615dd04c63b110be00a1 100644
--- a/types-and-classes/subtypep-array.lsp
+++ b/types-and-classes/subtypep-array.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "types-aux.lsp")
+
 
 ;;; *array-element-types* is defined in ansi-aux.lsp
 
diff --git a/types-and-classes/subtypep-complex.lsp b/types-and-classes/subtypep-complex.lsp
index 841dcbfd575c756a161fbd18bd53f30b186d027b..b34dd438a83fe8bd445f9da50c4f303b4a4f55ad 100644
--- a/types-and-classes/subtypep-complex.lsp
+++ b/types-and-classes/subtypep-complex.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "types-aux.lsp")
+
 
 (deftest subtypep-complex.1
   (subtypep* 'complex 'number)
diff --git a/types-and-classes/subtypep-cons.lsp b/types-and-classes/subtypep-cons.lsp
index 7cb110a0fa0d35e25d715a21286e8f3f4ff0dbc4..991fa0e953dc0c48f6edc640e0270e966539e228 100644
--- a/types-and-classes/subtypep-cons.lsp
+++ b/types-and-classes/subtypep-cons.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "types-aux.lsp")
+
 
 ;;; SUBTYPEP on CONS types
 
diff --git a/types-and-classes/subtypep-eql.lsp b/types-and-classes/subtypep-eql.lsp
index 75ec441f4c32ff0db2e73c4ec935607d63f48b9a..47079b29a45c3909e85f1dc45c229b0e3c4261ad 100644
--- a/types-and-classes/subtypep-eql.lsp
+++ b/types-and-classes/subtypep-eql.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "types-aux.lsp")
+
 
 (deftest subtypep.eql.1
   (let ((s1 (copy-seq "abc"))
diff --git a/types-and-classes/subtypep-float.lsp b/types-and-classes/subtypep-float.lsp
index 9f544be5e622ca53d1a05489789afba44ac20ed5..95e60b2cf34f01ca2810af1dfd47bd59c68e8c6c 100644
--- a/types-and-classes/subtypep-float.lsp
+++ b/types-and-classes/subtypep-float.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "types-aux.lsp")
+
 
 ;;;;;;;
 
diff --git a/types-and-classes/subtypep-function.lsp b/types-and-classes/subtypep-function.lsp
index ca360a0b0efc0d79c8f3d24388172eaa38e7a962..e4d8a34de5f4aee0afa1843e73cb4d2531c409bd 100644
--- a/types-and-classes/subtypep-function.lsp
+++ b/types-and-classes/subtypep-function.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "types-aux.lsp")
+
 
 (deftest subtypep-function.1
   (check-all-not-subtypep t '(function (t) t))
diff --git a/types-and-classes/subtypep-integer.lsp b/types-and-classes/subtypep-integer.lsp
index c6bbd6f07ed0fa9c6345cd876e6b73094527fbd8..effaa8948cbc0fbde70a2cc4bbc8ce9417483638 100644
--- a/types-and-classes/subtypep-integer.lsp
+++ b/types-and-classes/subtypep-integer.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "types-aux.lsp")
+
 
 (deftest subtypep.fixnum-or-bignum
   (check-equivalence '(or fixnum bignum) 'integer)
diff --git a/types-and-classes/subtypep-member.lsp b/types-and-classes/subtypep-member.lsp
index 9f17bf804b60304bd0947b30f63558a39a551c0d..5e35bbe11a20aa03e105431afe57f9de00b06a4b 100644
--- a/types-and-classes/subtypep-member.lsp
+++ b/types-and-classes/subtypep-member.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "types-aux.lsp")
+
 
 ;;; SUBTYPEP on MEMBER types
 
diff --git a/types-and-classes/subtypep-rational.lsp b/types-and-classes/subtypep-rational.lsp
index 8afced938935c101d1a8ab52fad899fe8324d12b..a6c1e2dd23f0956abf1860f993e70ec1edec2135 100644
--- a/types-and-classes/subtypep-rational.lsp
+++ b/types-and-classes/subtypep-rational.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "types-aux.lsp")
+
 
 ;;; SUBTYPEP on rational types
 
diff --git a/types-and-classes/subtypep-real.lsp b/types-and-classes/subtypep-real.lsp
index 6b503413ec36b0cd7bdcbb5276b13c1e030dd2bc..2b937e754c29b8cdccac4add91e7877c793f610c 100644
--- a/types-and-classes/subtypep-real.lsp
+++ b/types-and-classes/subtypep-real.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "types-aux.lsp")
+
 
 ;;; SUBTYPEP on real types
 
diff --git a/types-and-classes/subtypep.lsp b/types-and-classes/subtypep.lsp
index 44774ae5b7d28a79808cf0a2c41bdf0030aa30cd..2663cebb7bead952b029ac9ba280c235d640028d 100644
--- a/types-and-classes/subtypep.lsp
+++ b/types-and-classes/subtypep.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "types-aux.lsp")
+
 
 ;;; More subtypep tests are in types-and-class.lsp
 
diff --git a/types-and-classes/types-and-class-2.lsp b/types-and-classes/types-and-class-2.lsp
index b11f147bebdef4616ce7d539b3012eb1ad9af427..2c47f0b4aefa651221ab4a1251a10ea8c49ae9f2 100644
--- a/types-and-classes/types-and-class-2.lsp
+++ b/types-and-classes/types-and-class-2.lsp
@@ -5,7 +5,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "types-aux.lsp")
+
 
 ;;; Union of a type with its complement is universal
 
diff --git a/types-and-classes/types-and-class.lsp b/types-and-classes/types-and-class.lsp
index 29150a89b7ca7e0f06b50547e32457e009c029f7..c2d57927f4a22ed6a588613ae95311f4940472f6 100644
--- a/types-and-classes/types-and-class.lsp
+++ b/types-and-classes/types-and-class.lsp
@@ -7,7 +7,7 @@
 
 (in-package :cl-test)
 
-(compile-and-load "types-aux.lsp")
+
 
 (declaim (optimize (safety 3)))