diff --git a/.gitignore b/.gitignore
index e5f14257b2315a2c33f440432e7f1399367e38a4..101dfe7a6a3427a7338ea5f3142f6f76ea9e5fc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.fas
 ansi-aux-macros.fas
 ansi-aux.fas
 array-aux.fas
diff --git a/arrays/adjust-array.lsp b/arrays/adjust-array.lsp
index 11009de697cacb82c0c0e2051df309709c889f72..4fd21e259d0a31083f4bf1a95e842059a57e6e6a 100644
--- a/arrays/adjust-array.lsp
+++ b/arrays/adjust-array.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Feb 15 07:27:22 2004
 ;;;; Contains: Tests of ADJUST-ARRAY
 
-(in-package :cl-test)
+
 
 (defun listify-form (form)
   (cond
diff --git a/arrays/adjustable-array-p.lsp b/arrays/adjustable-array-p.lsp
index fdfce8b4ab3030b8caf52aac2de7efc161cd4228..03abfdd3ae35fffe27a277ed94e751a273e8d762 100644
--- a/arrays/adjustable-array-p.lsp
+++ b/arrays/adjustable-array-p.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Jan 20 21:25:22 2003
 ;;;; Contains: Tests for ADJUSTABLE-ARRAY-P
 
-(in-package :cl-test)
+
 
 (deftest adjustable-array-p.1
   (notnot (adjustable-array-p (make-array '(5) :adjustable t)))
diff --git a/arrays/aref.lsp b/arrays/aref.lsp
index efa080e6af96b55a1a798d74f05ee20d48013848..73d54fb626497324cfa1c3dd74b54f063788a245 100644
--- a/arrays/aref.lsp
+++ b/arrays/aref.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Feb 11 17:33:24 2003
 ;;;; Contains: Tests for AREF
 
-(in-package :cl-test)
+
 
 ;;; AREF is also tested in many other places
 
diff --git a/arrays/array-as-class.lsp b/arrays/array-as-class.lsp
index 879e090f64193e310e7045d31a584f916da0eae0..183f036fc6d29de54c7527736071d85dfc1e3f01 100644
--- a/arrays/array-as-class.lsp
+++ b/arrays/array-as-class.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 07:45:25 2003
 ;;;; Contains: Tests for ARRAY as a class
 
-(in-package :cl-test)
+
 
 (deftest array-as-class.1
   (notnot-mv (typep #() (find-class 'array)))
diff --git a/arrays/array-dimension.lsp b/arrays/array-dimension.lsp
index 25474a8c4e28dade2bc9e113ce8cb38eacab5fa8..7454cd5c484cdda785dbe686bb574c6a44718069 100644
--- a/arrays/array-dimension.lsp
+++ b/arrays/array-dimension.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jan 21 06:55:14 2003
 ;;;; Contains: Tests of ARRAY-DIMENSION
 
-(in-package :cl-test)
+
 
 ;;; array-dimension is also tested by the tests in make-array.lsp
 
diff --git a/arrays/array-dimensions.lsp b/arrays/array-dimensions.lsp
index 468e903c408b8fef5e1bf5a47ba538b9d3a3c0a0..3178556b33f40f2a8989bc51f8c28abc1c045ba9 100644
--- a/arrays/array-dimensions.lsp
+++ b/arrays/array-dimensions.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jan 21 06:59:37 2003
 ;;;; Contains: Tests of ARRAY-DIMENSIONS
 
-(in-package :cl-test)
+
 
 ;;; The tests in make-array.lsp also test this function
 
diff --git a/arrays/array-displacement.lsp b/arrays/array-displacement.lsp
index 84ddb212a98b50281531e7776099340599f7d825..f026ffa2f702b76acea8a14f532cf6b324323d53 100644
--- a/arrays/array-displacement.lsp
+++ b/arrays/array-displacement.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jan 21 06:20:51 2003
 ;;;; Contains: Tests for ARRAY-DISPLACEMENT
 
-(in-package :cl-test)
+
 
 ;;; The tests in make-array.lsp also test array-displacement
 
diff --git a/arrays/array-element-type.lsp b/arrays/array-element-type.lsp
index 5cf7ee81d4386b85c518d816cb5c0f3a92548318..97a0168a17afa6bc31d323c0008080ec8eff13f9 100644
--- a/arrays/array-element-type.lsp
+++ b/arrays/array-element-type.lsp
@@ -2,7 +2,7 @@
 ;;;; Author:   Paul Dietz
 ;;;; Contains: Tests of the function ARRAY-ELEMENT-TYPE
 
-(in-package :cl-test)
+
 
 ;;; Mosts tests are in other files, incidental to testing of
 ;;; other things
diff --git a/arrays/array-in-bounds-p.lsp b/arrays/array-in-bounds-p.lsp
index 6ae0d1253bd41a026cf283f24253a303d2eb2c4e..dc952214533997599334560800b25a294a3a2944 100644
--- a/arrays/array-in-bounds-p.lsp
+++ b/arrays/array-in-bounds-p.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jan 21 19:57:29 2003
 ;;;; Contains: Tests for ARRAY-IN-BOUNDS-P
 
-(in-package :cl-test)
+
 
 (deftest array-in-bounds-p.1
   (array-in-bounds-p #() 0)
diff --git a/arrays/array-misc.lsp b/arrays/array-misc.lsp
index 361b0a406fbbfcb466f0e2ad76214543484faac3..85914227a0eaa8e75e306df94abee1529897737f 100644
--- a/arrays/array-misc.lsp
+++ b/arrays/array-misc.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Jan 22 21:17:25 2003
 ;;;; Contains: Misc. tests of array features
 
-(in-package :cl-test)
+
 
 (deftest array-dimension-limit.1
   (and (<= 1024 array-dimension-limit) t)
diff --git a/arrays/array-rank.lsp b/arrays/array-rank.lsp
index ebc66db6278562f20121dc819ffcf80485cbab60..5fc7b1b8de16174bb0dc03b6176334ef2a566dc2 100644
--- a/arrays/array-rank.lsp
+++ b/arrays/array-rank.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jan 21 20:32:57 2003
 ;;;; Contains: Tests for ARRAY-RANK
 
-(in-package :cl-test)
+
 
 ;;; Most tests for ARRAY-RANK are in make-array.lsp
 
diff --git a/arrays/array-row-major-index.lsp b/arrays/array-row-major-index.lsp
index c6db17b60a18a25da10bee75aac606955d05abaf..d2843f55f30563f4bad95a7f5286514b1e8f5d01 100644
--- a/arrays/array-row-major-index.lsp
+++ b/arrays/array-row-major-index.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jan 21 21:37:03 2003
 ;;;; Contains: Tests of ARRAY-ROW-MAJOR-INDEX
 
-(in-package :cl-test)
+
 
 ;;; More array-row-major-index tests are in make-array.lsp
 
diff --git a/arrays/array-t.lsp b/arrays/array-t.lsp
index d9354fe7495e97040b6cb0011801968219f934d0..2c31d7d4aa1fe0ad6e7b8c16dd6c881878e86582 100644
--- a/arrays/array-t.lsp
+++ b/arrays/array-t.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Jan 25 11:55:48 2003
 ;;;; Contains: Tests of (array t ...) type specifiers
 
-(in-package :cl-test)
+
 
 ;;; Tests of (array t)
 
diff --git a/arrays/array-total-size.lsp b/arrays/array-total-size.lsp
index 2655175f3e74de1506fa3564b81ebb998240b0c6..89d2dc2976f1b9aacbe3e376ae6b145ca57d21ea 100644
--- a/arrays/array-total-size.lsp
+++ b/arrays/array-total-size.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jan 21 22:01:09 2003
 ;;;; Contains: Tests of ARRAY-TOTAL-SIZE
 
-(in-package :cl-test)
+
 
 ;;; More tests of ARRAY-TOTAL-SIZE are in make-array.lsp
 
diff --git a/arrays/array.lsp b/arrays/array.lsp
index 75ac0f1f99381fd580224f094136379cb63d656f..85494673b250825f44c43bf323b51cfd5e097216 100644
--- a/arrays/array.lsp
+++ b/arrays/array.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Jan 25 08:46:58 2003
 ;;;; Contains: Tests of the ARRAY type specifier
 
-(in-package :cl-test)
+
 
 ;;; Tests of array by itself
 
diff --git a/arrays/arrayp.lsp b/arrays/arrayp.lsp
index 6b354e96aeae402612f7eac6d644498319a41e32..32d1e6a742d48a6dfd0658a1bfbcfb113fdcb001 100644
--- a/arrays/arrayp.lsp
+++ b/arrays/arrayp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jan 21 22:08:21 2003
 ;;;; Contains: Tests of ARRAYP
 
-(in-package :cl-test)
+
 
 ;;; Also tested by make-array.lsp
 
diff --git a/arrays/bit-and.lsp b/arrays/bit-and.lsp
index 693c9b1846c62a489706f6246c1c48283cd5b59d..c9d4fa7927f4b44dcf14c0c8be619b0cc59c4db9 100644
--- a/arrays/bit-and.lsp
+++ b/arrays/bit-and.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 18:18:47 2003
 ;;;; Contains: Tests of BIT-AND
 
-(in-package :cl-test)
+
 
 
 
diff --git a/arrays/bit-andc1.lsp b/arrays/bit-andc1.lsp
index 24a521a8de623eec856ddcf3998bdbdc66c87abd..94f6abfee53fb8d955e35b00a30d7e486bfaf771 100644
--- a/arrays/bit-andc1.lsp
+++ b/arrays/bit-andc1.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 18:56:39 2003
 ;;;; Contains: Tests of BIT-ANDC1
 
-(in-package :cl-test)
+
 
 
 
diff --git a/arrays/bit-andc2.lsp b/arrays/bit-andc2.lsp
index 8138657af89db2ea2d0e6da267a5ec777f13bc9e..29a4e248c14c5f7d4bfa326b4c4ed61ea8f38a84 100644
--- a/arrays/bit-andc2.lsp
+++ b/arrays/bit-andc2.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 19:01:38 2003
 ;;;; Contains: Tests of BIT-ANDC2
 
-(in-package :cl-test)
+
 
 
 
diff --git a/arrays/bit-eqv.lsp b/arrays/bit-eqv.lsp
index abbc830aadbbb1eb0ca2c5a3e8e6d29402611670..af24af14fca7f4f1829126cacf676836f25569cd 100644
--- a/arrays/bit-eqv.lsp
+++ b/arrays/bit-eqv.lsp
@@ -4,7 +4,7 @@
 ;;;; Contains: Tests of BIT-EQV
 
 
-(in-package :cl-test)
+
 
 
 
diff --git a/arrays/bit-ior.lsp b/arrays/bit-ior.lsp
index d231ccde79ec9a3182ed434e302311d8a670a5e8..73918d1daaeb2082d3b9eb5690825cbe75e7625a 100644
--- a/arrays/bit-ior.lsp
+++ b/arrays/bit-ior.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 19:13:34 2003
 ;;;; Contains: Tests of BIT-IOR
 
-(in-package :cl-test)
+
 
 
 
diff --git a/arrays/bit-nand.lsp b/arrays/bit-nand.lsp
index d5dd884dc028fde5f17995ecc5b274ba9dcf71e6..3e633929e2b7e0da933b1d5c708808b8fdb5f203 100644
--- a/arrays/bit-nand.lsp
+++ b/arrays/bit-nand.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 19:16:15 2003
 ;;;; Contains: Tests for BIT-NAND
 
-(in-package :cl-test)
+
 
 
 
diff --git a/arrays/bit-nor.lsp b/arrays/bit-nor.lsp
index d4e3886d9a717b99338651d18bd3533e02533b06..b30d9259444a1781ca8664e34e81cc865db25387 100644
--- a/arrays/bit-nor.lsp
+++ b/arrays/bit-nor.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 19:20:40 2003
 ;;;; Contains: Tests for BIT-NOR
 
-(in-package :cl-test)
+
 
 
 
diff --git a/arrays/bit-not.lsp b/arrays/bit-not.lsp
index 5fb9aba8b75636663383858bc0de478826ce4f29..012376b0dbbacfb950ad1f1bad0b7c4398fd02af 100644
--- a/arrays/bit-not.lsp
+++ b/arrays/bit-not.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 19:40:13 2003
 ;;;; Contains: Tests of BIT-NOT
 
-(in-package :cl-test)
+
 
 (deftest bit-not.1
   (let ((a1 (make-array nil :element-type 'bit :initial-element 0)))
diff --git a/arrays/bit-orc1.lsp b/arrays/bit-orc1.lsp
index dca631c8c1bda852974f78286188f50bc31725e5..2f9dc446811e1a0a0b8451f2bd2f8bdb19babfba 100644
--- a/arrays/bit-orc1.lsp
+++ b/arrays/bit-orc1.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 19:25:28 2003
 ;;;; Contains: Tests of BIT-ORC1
 
-(in-package :cl-test)
+
 
 
 
diff --git a/arrays/bit-orc2.lsp b/arrays/bit-orc2.lsp
index 26801c72e879d04de58d510b0929e22272374065..cfc9b223a5b053d1cfdb441cffa8d260749ea53a 100644
--- a/arrays/bit-orc2.lsp
+++ b/arrays/bit-orc2.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 19:31:35 2003
 ;;;; Contains: Tests of BIT-ORC2
 
-(in-package :cl-test)
+
 
 
 
diff --git a/arrays/bit-vector-p.lsp b/arrays/bit-vector-p.lsp
index 2b5af30169bbba8eb4a299791635aacdce26fe56..5fc780ef39f22d9be3d32d24ab760c235f9ce1c1 100644
--- a/arrays/bit-vector-p.lsp
+++ b/arrays/bit-vector-p.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 20:16:50 2003
 ;;;; Contains: Tests of BIT-VECTOR-P
 
-(in-package :cl-test)
+
 
 (deftest bit-vector-p.2
   (notnot-mv (bit-vector-p #*))
diff --git a/arrays/bit-vector.lsp b/arrays/bit-vector.lsp
index 2c2f0cab8ab85858130b2fdeb34c48d06f907599..e099db2073a300efc974b93543e0c13b81c60fe1 100644
--- a/arrays/bit-vector.lsp
+++ b/arrays/bit-vector.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 13:03:22 2003
 ;;;; Contains: Tests of type BIT-VECTOR
 
-(in-package :cl-test)
+
 
 (deftest bit-vector.1
   (notnot-mv (find-class 'bit-vector))
diff --git a/arrays/bit-xor.lsp b/arrays/bit-xor.lsp
index 1360bf27ee37ee5c2d94a85a41adb50b0686fc74..c0111b752540613015bbc280b9706810b0cf3afe 100644
--- a/arrays/bit-xor.lsp
+++ b/arrays/bit-xor.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 19:35:46 2003
 ;;;; Contains: Tests of BIT-XOR
 
-(in-package :cl-test)
+
 
 
 
diff --git a/arrays/bit.lsp b/arrays/bit.lsp
index e043c70f4c0707048d45dd09d4756e6803309210..d012b4cff97b97cb476bbc2abdf9598b8c6a50b4 100644
--- a/arrays/bit.lsp
+++ b/arrays/bit.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 13:22:59 2003
 ;;;; Contains: Tests for accessor BIT
 
-(in-package :cl-test)
+
 
 (deftest bit.1
   (bit #*0010 2)
diff --git a/arrays/fill-pointer.lsp b/arrays/fill-pointer.lsp
index aa4b4daa6b43a85d5d6059ed6cc20cbaed5f2a93..a77aea6ebf0a043a0e7a0817fb98a75777d52ff6 100644
--- a/arrays/fill-pointer.lsp
+++ b/arrays/fill-pointer.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jan 21 22:14:23 2003
 ;;;; Contains: Tests of FILL-POINTER
 
-(in-package :cl-test)
+
 
 ;;; More tests are in make-array.lsp
 
diff --git a/arrays/load.lsp b/arrays/load.lsp
index 1e2f0bd3f230c45d4f674a12ee40e46aeb1436dd..c632e9c6695bed39ac70648e1bce6c179d94597b 100644
--- a/arrays/load.lsp
+++ b/arrays/load.lsp
@@ -2,7 +2,11 @@
 (compile-and-load "ANSI-TESTS:AUX;array-aux.lsp")
 (compile-and-load "ANSI-TESTS:AUX;bit-aux.lsp")
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "aref.lsp")
   (load "array.lsp")
   (load "array-t.lsp")
diff --git a/arrays/make-array.lsp b/arrays/make-array.lsp
index b1173d443f1eea7bc5b08aa193ee1dbe162e48c8..333cb52f4231d7e5ecbad63509484b1e4a87d2c2 100644
--- a/arrays/make-array.lsp
+++ b/arrays/make-array.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Sep 20 06:47:37 2002
 ;;;; Contains: Tests for MAKE-ARRAY
 
-(in-package :cl-test)
+
 
 
 
diff --git a/arrays/row-major-aref.lsp b/arrays/row-major-aref.lsp
index 01506015ab88df3f5972c5b0dba927115122948a..2b0cc7f47afbc0d6695ed2a180fb878ff885002c 100644
--- a/arrays/row-major-aref.lsp
+++ b/arrays/row-major-aref.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Jan 22 20:16:38 2003
 ;;;; Contains: Tests of ROW-MAJOR-AREF
 
-(in-package :cl-test)
+
 
 ;;; ROW-MAJOR-AREF is also used by equalp-with-case (see rt/rt.lsp)
 
diff --git a/arrays/sbit.lsp b/arrays/sbit.lsp
index 4775afe22ac7e1e431edcc4573736137078de8e5..8fd040b1cdf559e3bbe1824fbef28e3a66697e7b 100644
--- a/arrays/sbit.lsp
+++ b/arrays/sbit.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 15:30:31 2003
 ;;;; Contains: Tests for SBIT
 
-(in-package :cl-test)
+
 
 (deftest sbit.1
   (sbit #*0010 2)
diff --git a/arrays/simple-array-t.lsp b/arrays/simple-array-t.lsp
index 874db743c6b2bbecdcaee1ef2a7014fc9cdc49dd..70a69cd7732453f58a3b5452223ffc8f40a8d55b 100644
--- a/arrays/simple-array-t.lsp
+++ b/arrays/simple-array-t.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 07:23:45 2003
 ;;;; Contains: Tests of SIMPLE-ARRAY on T element type
 
-(in-package :cl-test)
+
 
 ;;; Tests of (simple-array t)
 
diff --git a/arrays/simple-array.lsp b/arrays/simple-array.lsp
index bbb9f5e341eec3b8a2d7d66b5579d2d3a5f6a02c..0c8212ec67a67e534b00b45b35a98ae068b97ca8 100644
--- a/arrays/simple-array.lsp
+++ b/arrays/simple-array.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 07:20:31 2003
 ;;;; Contains: Tests of SIMPLE-ARRAY
 
-(in-package :cl-test)
+
 
 ;;; Tests of simple-array by itself
 
diff --git a/arrays/simple-bit-vector-p.lsp b/arrays/simple-bit-vector-p.lsp
index 37f9cea4a0dd71cb7a98a27d24bcd3e76f77262c..06c169a12ce35b0210d1028b4cd163a9ba52c502 100644
--- a/arrays/simple-bit-vector-p.lsp
+++ b/arrays/simple-bit-vector-p.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 20:20:27 2003
 ;;;; Contains: Tests of SIMPLE-BIT-VECTOR-P
 
-(in-package :cl-test)
+
 
 (deftest simple-bit-vector-p.2
   (notnot-mv (simple-bit-vector-p #*))
diff --git a/arrays/simple-bit-vector.lsp b/arrays/simple-bit-vector.lsp
index ff56610c30436d045f2d9bb331f41380442860d2..80a8c533b822dfe2b91b98c347d671810bff5c65 100644
--- a/arrays/simple-bit-vector.lsp
+++ b/arrays/simple-bit-vector.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 13:12:07 2003
 ;;;; Contains: Tests for type SIMPLE-BIT-VECTOR
 
-(in-package :cl-test)
+
 
 (deftest simple-bit-vector.2
   (notnot-mv (typep #* 'simple-bit-vector))
diff --git a/arrays/simple-vector-p.lsp b/arrays/simple-vector-p.lsp
index 48a03d46370aa04d4bfdd319472cbcc67dae3ca1..fd3839573376c1f19ad8f403cf8c187717652302 100644
--- a/arrays/simple-vector-p.lsp
+++ b/arrays/simple-vector-p.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Jan 22 21:23:45 2003
 ;;;; Contains: Tests for SIMPLE-VECTOR-P
 
-(in-package :cl-test)
+
 
 ;;; More tests for this are in make-array.lsp
 
diff --git a/arrays/svref.lsp b/arrays/svref.lsp
index 0b8f6d1fbb68a1faf6af5c3b4f56158e1ce8d673..baa44ad96eca887edfa3c31331711dc8fdf79279 100644
--- a/arrays/svref.lsp
+++ b/arrays/svref.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Jan 22 21:39:30 2003
 ;;;; Contains: Tests of SVREF
 
-(in-package :cl-test)
+
 
 (deftest svref.1
   (let ((a (vector 1 2 3 4)))
diff --git a/arrays/upgraded-array-element-type.lsp b/arrays/upgraded-array-element-type.lsp
index ad8f390110231cdfa7fbb9756605630ad82280b6..b4533490be81589b96f8b93ef1dfadc55e4512b1 100644
--- a/arrays/upgraded-array-element-type.lsp
+++ b/arrays/upgraded-array-element-type.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Jan 22 20:43:55 2003
 ;;;; Contains: Tests of UPGRADED-ARRAY-ELEMENT-TYPE
 
-(in-package :cl-test)
+
 
 (deftest upgraded-array-element-type.1
   (let ((upgraded-bit (upgraded-array-element-type 'bit)))
diff --git a/arrays/vector-pop.lsp b/arrays/vector-pop.lsp
index d7a31635fb60d1e11c1c4b79a2d8fa049695c769..e64c376cd70871bd8d2d40bb450eb118d6d4c90b 100644
--- a/arrays/vector-pop.lsp
+++ b/arrays/vector-pop.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Jan 24 07:46:29 2003
 ;;;; Contains: Tests for VECTOR-POP
 
-(in-package :cl-test)
+
 
 (deftest vector-pop.1
   (let ((v (make-array '(5) :initial-contents '(a b c d e)
diff --git a/arrays/vector-push-extend.lsp b/arrays/vector-push-extend.lsp
index 996f407e6b5ce649313e4c48f9c7b562bce5e188..80256166d558bc57773806566a94b1f7cf60d7de 100644
--- a/arrays/vector-push-extend.lsp
+++ b/arrays/vector-push-extend.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Jan 25 08:04:35 2003
 ;;;; Contains: Tests for VECTOR-PUSH-EXTEND
 
-(in-package :cl-test)
+
 
 (deftest vector-push-extend.1
   (let ((a (make-array '(5) :fill-pointer 2
diff --git a/arrays/vector-push.lsp b/arrays/vector-push.lsp
index 83f1fb6a7ccb4b5259efd094f2c1790905382aa7..8288de81fed42727dc510dba4133680ff33a67f8 100644
--- a/arrays/vector-push.lsp
+++ b/arrays/vector-push.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Jan 25 00:55:43 2003
 ;;;; Contains: Tests for VECTOR-PUSH
 
-(in-package :cl-test)
+
 
 (deftest vector-push.1
   (let ((a (make-array '(5) :fill-pointer 2
diff --git a/arrays/vector.lsp b/arrays/vector.lsp
index 23d1536b0f4ab7e50f80f0b2d5ea509deb489d12..2946464fdb20755e2d00ce0700b122251e8dc4fd 100644
--- a/arrays/vector.lsp
+++ b/arrays/vector.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Jan 23 06:32:02 2003
 ;;;; Contains: Tests of VECTOR (type and function)
 
-(in-package :cl-test)
+
 
 ;;; More tests of type vector in make-array.lsp
 
diff --git a/arrays/vectorp.lsp b/arrays/vectorp.lsp
index 75683b88399de5abd455b1b7433e02129bdd7a99..c60a8f262444d8831e918d784cb94456e12658d8 100644
--- a/arrays/vectorp.lsp
+++ b/arrays/vectorp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 13:17:05 2003
 ;;;; Contains: Tests for VECTORP
 
-(in-package :cl-test)
+
 
 (deftest vectorp.1
   (vectorp 1)
diff --git a/auxiliary/ansi-aux-macros.lsp b/auxiliary/ansi-aux-macros.lsp
index 1b49e87fa70eebf4e390b6c5e05c42193dd50a75..6b4b90304e1738a1633f46dc7a1f8089345d7b77 100644
--- a/auxiliary/ansi-aux-macros.lsp
+++ b/auxiliary/ansi-aux-macros.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Jul  2 07:05:41 2003
 ;;;; Contains: Macros used in ansi-aux and elsewhere.
 
-(in-package :cl-test)
+
 
 (declaim (optimize (safety 3)))
 
diff --git a/auxiliary/ansi-aux.lsp b/auxiliary/ansi-aux.lsp
index b59839bbb546523bfc28cce9c48610be166cbaec..c22e294aad0b640800193bed4d5525d55404b487 100644
--- a/auxiliary/ansi-aux.lsp
+++ b/auxiliary/ansi-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Mar 28 17:10:18 1998
 ;;;; Contains: Aux. functions for CL-TEST
 
-(in-package :cl-test)
+
 
 (declaim (optimize (safety 3)))
 
diff --git a/auxiliary/array-aux.lsp b/auxiliary/array-aux.lsp
index 193867dea2b38cc3d20ee9c85a43951a288bd59e..84c1f33072e4550144b8362daea77f599e7280ca 100644
--- a/auxiliary/array-aux.lsp
+++ b/auxiliary/array-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jan 21 05:11:31 2003
 ;;;; Contains: Auxiliary functions for array tests
 
-(in-package :cl-test)
+
 
 (defun make-array-check-upgrading (type)
   (subtypep* type (array-element-type (make-array 0 :element-type type))))
diff --git a/auxiliary/backquote-aux.lsp b/auxiliary/backquote-aux.lsp
index 7ff2953e6b3b7534e6e098f78345835def4fd8d6..d75303e0b5ef05b85ff4fa5dbfdfa94f3dcd041f 100644
--- a/auxiliary/backquote-aux.lsp
+++ b/auxiliary/backquote-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Jun 11 08:04:23 2004
 ;;;; Contains: Aux. functions associated with backquote tests
 
-(in-package :cl-test)
+
 
 ;;; Not yet finished
 
diff --git a/auxiliary/bit-aux.lsp b/auxiliary/bit-aux.lsp
index da0193bba977acb13159bbee3e365b97d5159d4f..3905a607c1f4f25e224fefabf97b5cadf34ff31e 100644
--- a/auxiliary/bit-aux.lsp
+++ b/auxiliary/bit-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jul 24 19:25:39 2005
 ;;;; Contains: Aux file for BIT-* tests
 
-(in-package :cl-test)
+
 
 (defun bit-random-test-fn (bit-fn log-fn &key (reps 5000) (maxlen 100))
   (assert (typep maxlen '(integer 1)))
diff --git a/auxiliary/ceiling-aux.lsp b/auxiliary/ceiling-aux.lsp
index 6e74c9eecd0c43de01700d61b256434721791adf..29c300bdddd4b9a7a9b07eee40c425298c903d81 100644
--- a/auxiliary/ceiling-aux.lsp
+++ b/auxiliary/ceiling-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Aug 19 06:52:02 2003
 ;;;; Contains: Aux. functions for CEILING
 
-(in-package :cl-test)
+
 
 (defun ceiling.1-fn ()
   (loop for n = (- (random 2000000000)
diff --git a/auxiliary/char-aux.lsp b/auxiliary/char-aux.lsp
index bade2ca35c51d56f09f4e17415d31de9ee7b4b90..67f059fff73aec3bc051efdfc521217cee45e375 100644
--- a/auxiliary/char-aux.lsp
+++ b/auxiliary/char-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Oct  5 20:15:55 2002
 ;;;; Contains: Auxiliary functions for character tests
 
-(in-package :cl-test)
+
 
 (defun is-ordered-by (seq fn)
   (declare (type function fn))
diff --git a/auxiliary/cl-symbols-aux.lsp b/auxiliary/cl-symbols-aux.lsp
index 0e88f7760e81deda948ee3fd545bc67be295baf2..c6bdbf55fcfb3d437ce2153436eee010464373f4 100644
--- a/auxiliary/cl-symbols-aux.lsp
+++ b/auxiliary/cl-symbols-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Nov 28 06:43:51 2002
 ;;;; Contains: Aux. functions for cl-symbols.lsp
 
-(in-package :cl-test)
+
 
 (declaim (optimize (safety 3)))
 
diff --git a/auxiliary/cons-aux.lsp b/auxiliary/cons-aux.lsp
index 6d5003c8bb1bc29b6fd3aeda3af0f43300ee27c0..09596f69a5a5e870ffa8b02f7b4147ce0ad7f883 100644
--- a/auxiliary/cons-aux.lsp
+++ b/auxiliary/cons-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Mar  6 17:45:42 2003
 ;;;; Contains: Auxiliary functions for cons-related tests
 
-(in-package :cl-test)
+
 
 ;;;
 ;;; A scaffold is a structure that is used to remember the object
diff --git a/auxiliary/defclass-aux.lsp b/auxiliary/defclass-aux.lsp
index cc17f6aa5df082989fdf35010b5722865291ede1..1632e6bf4a0ec97a8631a5e434538637ab167aa8 100644
--- a/auxiliary/defclass-aux.lsp
+++ b/auxiliary/defclass-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Mar 24 03:40:24 2003
 ;;;; Contains: Auxiliary functions for testing CLOS
 
-(in-package :cl-test)
+
 
 (defun make-defclass-test-name (&rest args)
   (intern (apply #'concatenate 'string (mapcar #'string args))
diff --git a/auxiliary/define-condition-aux.lsp b/auxiliary/define-condition-aux.lsp
index bc179677f40364e2c85d0dc5796ef925c29dbd08..0035046625aaf7af0bb2ddc93c4570e5c5ae1234 100644
--- a/auxiliary/define-condition-aux.lsp
+++ b/auxiliary/define-condition-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Mar  9 05:40:13 2003
 ;;;; Contains: Auxiliary functions for testing DEFINE-CONDITION
 
-(in-package :cl-test)
+
 
 (defun make-def-cond-name (name &rest suffixes)
   (intern (apply #'concatenate 'string (string name) "/"
diff --git a/auxiliary/division-aux.lsp b/auxiliary/division-aux.lsp
index 2cb3c3b4aaa1c44d18f452b5085990f6921312fd..dfcf84b2aa2957433a6dcd715e9091ef8a9f42f7 100644
--- a/auxiliary/division-aux.lsp
+++ b/auxiliary/division-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Sep  1 07:57:02 2003
 ;;;; Contains: Aux. functions for testing /
 
-(in-package :cl-test)
+
 
 (defun divide-by-zero-test (&rest args)
   (handler-case
diff --git a/auxiliary/exp-aux.lsp b/auxiliary/exp-aux.lsp
index 2d43194a611621b4a1558b924b93c9f0d110f43a..5f99a0f21adb278aa4597203a94e20b9aa9eeadf 100644
--- a/auxiliary/exp-aux.lsp
+++ b/auxiliary/exp-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Sep  1 21:30:38 2003
 ;;;; Contains: Aux. functions for testing EXP, EXPT
 
-(in-package :cl-test)
+
 
 (defun my-exp (x n)
   "Compute e^x in the appropriate float result type, summing
diff --git a/auxiliary/fceiling-aux.lsp b/auxiliary/fceiling-aux.lsp
index a4542dfd0436371b61685068cc0a3ee490c5b697..ca6c1e1511898c472a94a1bf3869f56d7732ae3a 100644
--- a/auxiliary/fceiling-aux.lsp
+++ b/auxiliary/fceiling-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Aug 20 06:24:45 2003
 ;;;; Contains: Tests of FCEILING
 
-(in-package :cl-test)
+
 
 (defun fceiling.1-fn ()
   (loop for n = (- (random 200000)
diff --git a/auxiliary/ffloor-aux.lsp b/auxiliary/ffloor-aux.lsp
index af8ddb898f5c661f729e14a91f47bfbd3f0782e7..14ccd9a287bb5ccb178051ebb3df1106c98c270a 100644
--- a/auxiliary/ffloor-aux.lsp
+++ b/auxiliary/ffloor-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Aug 12 07:02:07 2003
 ;;;; Contains: Aux. functions used in FFLOOR tests
 
-(in-package :cl-test)
+
 
 (defun ffloor.1-fn ()
   (loop for n = (- (random 200000)
diff --git a/auxiliary/floor-aux.lsp b/auxiliary/floor-aux.lsp
index 0c3153838b4c0611c91417bed80bce09fe97f18c..314d5abc7e142a0d364b72857ba5954502457d9f 100644
--- a/auxiliary/floor-aux.lsp
+++ b/auxiliary/floor-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Aug  9 08:08:00 2003
 ;;;; Contains: Aux. functions used in FLOOR tests
 
-(in-package :cl-test)
+
 
 (defun floor.1-fn ()
   (loop for n = (- (random 2000000000)
diff --git a/auxiliary/fround-aux.lsp b/auxiliary/fround-aux.lsp
index c21f093c69a5245475cad97e4242c46aeff71d20..9f90613ddc9252fdecb0da22f9263517b5b90321 100644
--- a/auxiliary/fround-aux.lsp
+++ b/auxiliary/fround-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Aug 21 16:08:55 2003
 ;;;; Contains: Aux. functions for testing FROUND
 
-(in-package :cl-test)
+
 
 (defun fround.1-fn ()
   (loop for n = (- (random 200000)
diff --git a/auxiliary/ftruncate-aux.lsp b/auxiliary/ftruncate-aux.lsp
index 4cb563981bca8352135d8f9c1f97d5105f783c41..aa9d292be33ce3e71ba96365451ec3a8e8677d49 100644
--- a/auxiliary/ftruncate-aux.lsp
+++ b/auxiliary/ftruncate-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Aug 20 06:37:01 2003
 ;;;; Contains: Aux. functions for testing FTRUNCATE
 
-(in-package :cl-test)
+
 
 (defun ftruncate.1-fn ()
   (loop for n = (- (random 200000)
diff --git a/auxiliary/gcd-aux.lsp b/auxiliary/gcd-aux.lsp
index 7e974214a15f32ec76f1551d2ef91305e34d4736..06eeebb0c3353cbb84bf22b34a0edf5950865ead 100644
--- a/auxiliary/gcd-aux.lsp
+++ b/auxiliary/gcd-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Sep  3 06:57:22 2003
 ;;;; Contains: Aux. functions for testing GCD
 
-(in-package :cl-test)
+
 
 (defun my-gcd (x y)
   (cond
diff --git a/auxiliary/hash-table-aux.lsp b/auxiliary/hash-table-aux.lsp
index dd5ceb605801fe0052e2776ce306a6cfaa5e0351..0d4f96e810fd4a032d59f90c3de3c98017f83fb0 100644
--- a/auxiliary/hash-table-aux.lsp
+++ b/auxiliary/hash-table-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Oct  4 09:24:24 2003
 ;;;; Contains: Aux. functions for testing hash tables
 
-(in-package :cl-test)
+
 
 (eval-when (:load-toplevel :compile-toplevel :execute)
   (compile-and-load "ANSI-TESTS:AUX;random-aux.lsp"))
diff --git a/auxiliary/numbers-aux.lsp b/auxiliary/numbers-aux.lsp
index c9ef7b5daf14d22c27411bded3e77546ad83341e..eaa5d5b8adb2ad2ab78e5c0fbc7f176d27ed7196 100644
--- a/auxiliary/numbers-aux.lsp
+++ b/auxiliary/numbers-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Apr  7 07:24:43 2003
 ;;;; Contains: Auxiliary functions for number tests
 
-(in-package :cl-test)
+
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (compile-and-load "ANSI-TESTS:AUX;random-aux.lsp"))
diff --git a/auxiliary/package-aux.lsp b/auxiliary/package-aux.lsp
index ac0d9728ddee847ebbad586b23ecc0c220d10318..874c6b09486146260f8918d33568e18e33832233 100644
--- a/auxiliary/package-aux.lsp
+++ b/auxiliary/package-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Jun 21 20:59:17 2004
 ;;;; Contains: Aux. functions for package tests
 
-(in-package :cl-test)
+
 
 (defmacro test-with-package-iterator (package-list-expr &rest symbol-types)
   "Build an expression that tests the with-package-iterator form."
diff --git a/auxiliary/packages00-aux.lsp b/auxiliary/packages00-aux.lsp
index 08a0b4f0d870246a090dbc23493bb267928d16aa..5e2ecfd36c1cc9a54eff4985ce1aa9b403a981bb 100644
--- a/auxiliary/packages00-aux.lsp
+++ b/auxiliary/packages00-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 25 08:07:31 1998
 ;;;; Contains: Package test code (common code)
 
-(in-package :cl-test)
+
 (declaim (optimize (safety 3)))
 
 (report-and-ignore-errors
diff --git a/auxiliary/pathnames-aux.lsp b/auxiliary/pathnames-aux.lsp
index e17de67164f50b18da4e91571184df465359a954..f203b8d083b4dcdc1b25681dd4a83ea75efd6fe3 100644
--- a/auxiliary/pathnames-aux.lsp
+++ b/auxiliary/pathnames-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Dec  6 15:05:05 2003
 ;;;; Contains: Functions associated with pathname tests
 
-(in-package :cl-test)
+
 
 (defun could-be-pathname-designator (x)
   (or (stringp x)
diff --git a/auxiliary/printer-aux.lsp b/auxiliary/printer-aux.lsp
index f6d7ca3b9bd1e8e24428a4523115cad05ca8ab01..d1b3db0987b03298560dbad469611d48116521dc 100644
--- a/auxiliary/printer-aux.lsp
+++ b/auxiliary/printer-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Feb 23 06:20:00 2004
 ;;;; Contains: Auxiliary functions and macros for printer tests
 
-(in-package :cl-test)
+
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (compile-and-load "ANSI-TESTS:AUX;random-aux.lsp"))
diff --git a/auxiliary/random-aux.lsp b/auxiliary/random-aux.lsp
index 2f91e35606793735eee036e220e479dc4d500346..4135ea2330ee0cc235388c61849383803f0f3971 100644
--- a/auxiliary/random-aux.lsp
+++ b/auxiliary/random-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jun  8 06:56:15 2003
 ;;;; Contains: Aux. functions and macros used for randomization
 
-(in-package :cl-test)
+
 
 (declaim (special +standard-chars+ *cl-symbols-vector*))
 
diff --git a/auxiliary/random-class-aux.lsp b/auxiliary/random-class-aux.lsp
index 292e3977ac3400ac2fedd305b003d68d80348dc4..3d53d05cf2d9eb2e2b5710720298901c2440b707 100644
--- a/auxiliary/random-class-aux.lsp
+++ b/auxiliary/random-class-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Oct 10 07:14:30 2004
 ;;;; Contains: Aux. functions for random tests on classes
 
-(in-package :cl-test)
+
 
 (defun random-class-1-fn (&key (n 10) (rep 1000))
   "Randomly break and recreate a linear chain of class definitions"
diff --git a/auxiliary/reader-aux.lsp b/auxiliary/reader-aux.lsp
index 490f3f60a5ad7dd2aa7184cbb3af9075af75568a..c84ed28b71453a8a43c24a15b8bc5abb612f1069 100644
--- a/auxiliary/reader-aux.lsp
+++ b/auxiliary/reader-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Jan 14 07:43:48 2005
 ;;;; Contains: Auxiliary functions and macros for reader tests
 
-(in-package :cl-test)
+
 
 ;;; Define a test using standard io syntax
 
diff --git a/auxiliary/remove-aux.lsp b/auxiliary/remove-aux.lsp
index 94a1ebc997918cdf3824cf2d71b1f1069c948fd4..326b96596c8ee4153a7a89a7b1ed20155d8f869b 100644
--- a/auxiliary/remove-aux.lsp
+++ b/auxiliary/remove-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Sep 15 07:42:36 2002
 ;;;; Contains: Auxiliary functions for testing REMOVE and related functions
 
-(in-package :cl-test)
+
 
 (defun make-random-element (type)
   (cond
diff --git a/auxiliary/remove-duplicates-aux.lsp b/auxiliary/remove-duplicates-aux.lsp
index 0207d32936b4cd2a8a4133490d0379221f1c87b5..de1d5fc5ed603aed66cad1eafc1c4841043ad08b 100644
--- a/auxiliary/remove-duplicates-aux.lsp
+++ b/auxiliary/remove-duplicates-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Sep 23 20:59:10 2002
 ;;;; Contains: Aux. functions for testing REMOVE-DUPLICATES/DELETE-DUPLICATES
 
-(in-package :cl-test)
+
 
 (defun my-remove-duplicates (orig-sequence
                              &key from-end test test-not (start 0) end key)
diff --git a/auxiliary/round-aux.lsp b/auxiliary/round-aux.lsp
index 5eb4a44f5add42b8d41f0a189220eb99daa863fb..97756d12e0221feafba5796aa01b0e20376485b3 100644
--- a/auxiliary/round-aux.lsp
+++ b/auxiliary/round-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Aug 21 14:21:07 2003
 ;;;; Contains: Aux. functions for testing ROUND
 
-(in-package :cl-test)
+
 
 (defun round.1-fn ()
   (loop for n = (- (random 2000000000)
diff --git a/auxiliary/search-aux.lsp b/auxiliary/search-aux.lsp
index c2e6c579b387ca033eced6988a70b599ee607de7..0e442c56d798ff41bf33281e7bb449990b1d9854 100644
--- a/auxiliary/search-aux.lsp
+++ b/auxiliary/search-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Aug 24 07:22:10 2002
 ;;;; Contains: Aux. functions for testing SEARCH
 
-(in-package :cl-test)
+
 
 (defparameter *searched-list*
   '(b b a b b b b b b b a b a b b b a b a b b b a a a a b a a b a a a a a
diff --git a/auxiliary/sort-aux.lsp b/auxiliary/sort-aux.lsp
index 96119fd5aca56301928f0ad249a3223db568da11..9601e389bdd25f53444e8bee288391c2c9093b20 100644
--- a/auxiliary/sort-aux.lsp
+++ b/auxiliary/sort-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Jul 17 06:42:27 2003
 ;;;; Contains: Routines for testing SORT, NSORT
 
-(in-package :cl-test)
+
 
 (defun my-numeric-sort (list)
   "Sort (nondestructively) a list of reals."
diff --git a/auxiliary/string-aux.lsp b/auxiliary/string-aux.lsp
index 9b00f849473a131b24158fd46e66050617f16b80..c7f16c42610ca98e888902ebb731672a73d552a2 100644
--- a/auxiliary/string-aux.lsp
+++ b/auxiliary/string-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Oct  4 06:51:32 2002
 ;;;; Contains: Auxiliary functions for string testing
 
-(in-package :cl-test)
+
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (compile-and-load "ANSI-TESTS:AUX;random-aux.lsp"))
diff --git a/auxiliary/subseq-aux.lsp b/auxiliary/subseq-aux.lsp
index fba5149a95be92c64da414b6bcd3ce501e17f5c6..585aca1e2438d96fc5c8122413840ad826b3cb92 100644
--- a/auxiliary/subseq-aux.lsp
+++ b/auxiliary/subseq-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Nov 26 20:01:27 2002
 ;;;; Contains: Aux. functions for subseq tests
 
-(in-package :cl-test)
+
 
 (defun subseq-list.4-body ()
   (block done
diff --git a/auxiliary/times-aux.lsp b/auxiliary/times-aux.lsp
index 64137b706459d97f2423dbfb044b8d9fabf9e559..b74a787128e29bf66bc7d34e84a4da346cb1a794 100644
--- a/auxiliary/times-aux.lsp
+++ b/auxiliary/times-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Aug 28 11:23:40 2003
 ;;;; Contains: Auxiliary functions for testing the multiplication operator *
 
-(in-package :cl-test)
+
 
 (defun integer-times (x y)
   (assert (integerp x))
diff --git a/auxiliary/truncate-aux.lsp b/auxiliary/truncate-aux.lsp
index c99d2b50709bf1a93fd8c2b28fd1cc52ad1222ed..aabdfa8eb87f6853f1566874ab256235055f56df 100644
--- a/auxiliary/truncate-aux.lsp
+++ b/auxiliary/truncate-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Aug 20 05:15:17 2003
 ;;;; Contains: Aux. functions associated with tests of TRUNCATE
 
-(in-package :cl-test)
+
 
 (defun truncate.1-fn ()
   (loop for n = (- (random 2000000000)
diff --git a/auxiliary/types-aux.lsp b/auxiliary/types-aux.lsp
index efbba764773238861358bf2e3e0422003c84f3b5..091af89e772180f304698eadc65c6a068bccac9e 100644
--- a/auxiliary/types-aux.lsp
+++ b/auxiliary/types-aux.lsp
@@ -3,8 +3,6 @@
 ;;;; Created:  Mon Jun 21 20:14:38 2004
 ;;;; Contains: Aux. functions for types tests
 
-(in-package :cl-test)
-
 (defun classes-are-disjoint (c1 c2)
   "If either c1 or c2 is a builtin class or the name of a builtin
    class, then check for disjointness.  Return a non-NIL list
diff --git a/characters/char-compare.lsp b/characters/char-compare.lsp
index 7799c680198bcb23f78bb872647caeb8dcb297b1..8054d4bc84c7e52190fdd1609e307d992a9baf46 100644
--- a/characters/char-compare.lsp
+++ b/characters/char-compare.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Oct  5 19:36:00 2002
 ;;;; Contains: Tests of character comparison functions
 
-(in-package :cl-test)
+
 
 ;;; The character comparisons should throw a PROGRAM-ERROR when
 ;;; safe-called with no arguments
diff --git a/characters/character.lsp b/characters/character.lsp
index 1f2ef5f5646d8cfc3cc18fe94b94051973fc7529..a8b768ca131bb2cdf10d5060e8a6a7e437716466 100644
--- a/characters/character.lsp
+++ b/characters/character.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Oct  5 12:52:18 2002
 ;;;; Contains: Tests associated with the class CHARACTER
 
-(in-package :cl-test)
+
 
 (deftest character-class.1
   (subtypep* 'character t)
diff --git a/characters/load.lsp b/characters/load.lsp
index 63ea04ddc5f7d9d0601946c143043e624e515ab6..232d8b1b9f14e45830f943de0560c9c5249cbf98 100644
--- a/characters/load.lsp
+++ b/characters/load.lsp
@@ -1,7 +1,11 @@
 ;;;; Character tests
 (compile-and-load "ANSI-TESTS:AUX;char-aux.lsp")
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "character.lsp")
   (load "char-compare.lsp")
   (load "name-char.lsp")
diff --git a/characters/name-char.lsp b/characters/name-char.lsp
index 34530e71baf8821e717aeeee0d401ca7b7806e3a..aae29892b37cd1441c566199803ecdb737adfb93 100644
--- a/characters/name-char.lsp
+++ b/characters/name-char.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Aug 29 17:14:03 2004
 ;;;; Contains: Tests of NAME-CHAR
 
-(in-package :cl-test)
+
 
 
 
diff --git a/conditions/abort.lsp b/conditions/abort.lsp
index f249953ebea3f23f7aad72831b56fc953b2b25df..a99aa143baf3859a672636850355e66715fbf04f 100644
--- a/conditions/abort.lsp
+++ b/conditions/abort.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Mar 23 08:25:50 2003
 ;;;; Contains: Tests of the ABORT restart and function
 
-(in-package :cl-test)
+
 
 (deftest abort.1
   (restart-case
diff --git a/conditions/assert.lsp b/conditions/assert.lsp
index ac50ebeda5222179edaf253c4fa262be60bdbc2c..38eee2307d5e94629e107b4244fb20f7bb0ddcc4 100644
--- a/conditions/assert.lsp
+++ b/conditions/assert.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jan 28 06:48:19 2003
 ;;;; Contains: Tests of ASSERT
 
-(in-package :cl-test)
+
 
 (deftest assert.1
   (assert t)
diff --git a/conditions/cell-error-name.lsp b/conditions/cell-error-name.lsp
index 0ea7d46b5b7a0307312f43a1a22f3cc77a6c6c8d..83b7e559ecb314c023f38a7ff820b05fd69d282e 100644
--- a/conditions/cell-error-name.lsp
+++ b/conditions/cell-error-name.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Jan 27 22:36:48 2003
 ;;;; Contains: Tests of CELL-ERROR-NAME
 
-(in-package :cl-test)
+
 
 (deftest cell-error-name.1
   (handler-case
diff --git a/conditions/cerror.lsp b/conditions/cerror.lsp
index 10f5c3c2fc50bd0e29ad3e969014efbecfb8d8a6..1f278c40b6e2480a08926d67efdb592cefd771ad 100644
--- a/conditions/cerror.lsp
+++ b/conditions/cerror.lsp
@@ -4,7 +4,7 @@
 ;;;; Contains: Tests of CERROR
 
 
-(in-package :cl-test)
+
 
 (deftest cerror.1
   (let ((fmt "Cerror"))
diff --git a/conditions/check-type.lsp b/conditions/check-type.lsp
index 66cbb32353fd4965051d71b5c62210ef101270de..7749c8143333b66bd575512f039a9f86640bd75b 100644
--- a/conditions/check-type.lsp
+++ b/conditions/check-type.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Feb 15 20:12:04 2003
 ;;;; Contains: Tests of CHECK-TYPE
 
-(in-package :cl-test)
+
 
 (deftest check-type.1
   (let ((x 'a))
diff --git a/conditions/compute-restarts.lsp b/conditions/compute-restarts.lsp
index 3890c55a420ea95e407f6aad200eedaf17f0ab4d..a16d06feeedc62ccb70a13a9cfab3e3817560219 100644
--- a/conditions/compute-restarts.lsp
+++ b/conditions/compute-restarts.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Mar 22 23:48:53 2003
 ;;;; Contains: Tests of COMPUTE-RESTARTS
 
-(in-package :cl-test)
+
 
 (deftest compute-restarts.1
   (loop for r in (compute-restarts)
diff --git a/conditions/condition.lsp b/conditions/condition.lsp
index 0a52a4d8844599fd7b413efae7e4d55fcdd3cdb5..2a967882e13fd5a51c6ddcecb1e618a7e26867cd 100644
--- a/conditions/condition.lsp
+++ b/conditions/condition.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Jan 27 22:13:25 2003
 ;;;; Contains: Tests of class CONDITION
 
-(in-package :cl-test)
+
 
 (deftest condition.1
   (notnot-mv (find-class 'condition nil))
diff --git a/conditions/continue.lsp b/conditions/continue.lsp
index ba063ab85ecead1ccd5358cdf78c561380560206..35cecf43d151ea390ace82d2d65c297c8762154a 100644
--- a/conditions/continue.lsp
+++ b/conditions/continue.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Mar 23 08:37:15 2003
 ;;;; Contains: Tests of CONTINUE restart and function
 
-(in-package :cl-test)
+
 
 (deftest continue.1
   (restart-case
diff --git a/conditions/define-condition.lsp b/conditions/define-condition.lsp
index cba8fd5f16382d47b79a7dbc759d0267b8bb4f29..ae02b60cf1ee9b62410c8897d940197f56a5f961 100644
--- a/conditions/define-condition.lsp
+++ b/conditions/define-condition.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Mar  8 22:38:53 2003
 ;;;; Contains: Tests of DEFINE-CONDITION (part 1)
 
-(in-package :cl-test)
+
 
 ;;;
 
diff --git a/conditions/error.lsp b/conditions/error.lsp
index 970424b66ce5bd2a53817c4135f1c80e65b0731d..30fb68966c0a0979fb3b0209b5cd00c8b3ec58c5 100644
--- a/conditions/error.lsp
+++ b/conditions/error.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jan 28 21:37:43 2003
 ;;;; Contains: Tests of ERROR
 
-(in-package :cl-test)
+
 
 (deftest error.1
   (let ((fmt "Error"))
diff --git a/conditions/handler-bind.lsp b/conditions/handler-bind.lsp
index 24c20904a67d52f7c53c25b72bdaddba3fc545ff..53ebb2bfd05b448cba80426f08ed46117e266f57 100644
--- a/conditions/handler-bind.lsp
+++ b/conditions/handler-bind.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Feb 28 22:07:25 2003
 ;;;; Contains: Tests of HANDLER-BIND
 
-(in-package :cl-test)
+
 
 (deftest handler-bind.1
   (handler-bind ())
diff --git a/conditions/handler-case.lsp b/conditions/handler-case.lsp
index 456f1678467009420f0a1fd93c15a4e1e5e5f1f9..2101280aa0545c672a7b0031f7d5da588b99e862 100644
--- a/conditions/handler-case.lsp
+++ b/conditions/handler-case.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Mar  1 14:08:07 2003
 ;;;; Contains: Tests of HANDLER-CASE
 
-(in-package :cl-test)
+
 
 (deftest handler-case.1
   (handler-case
diff --git a/conditions/ignore-errors.lsp b/conditions/ignore-errors.lsp
index ae2f54c4aaf2635fb1f23cb14a4936d49c599ab3..87ed5a5cf3ebefd853e6b5e6dc17d8db663f5b69 100644
--- a/conditions/ignore-errors.lsp
+++ b/conditions/ignore-errors.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Mar  2 20:38:25 2003
 ;;;; Contains: Tests of IGNORE-ERRORS
 
-(in-package :cl-test)
+
 
 (deftest ignore-errors.1
   (ignore-errors)
diff --git a/conditions/invoke-debugger.lsp b/conditions/invoke-debugger.lsp
index 5a7655b06c20acfe9d63ea438169db07a9020e49..88d591fe0eb27e54b03bdadd3958a17ddd144243 100644
--- a/conditions/invoke-debugger.lsp
+++ b/conditions/invoke-debugger.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Feb 28 21:59:57 2003
 ;;;; Contains: Tests of INVOKE-DEBUGGER
 
-(in-package :cl-test)
+
 
 ;;; We can't test actual entry into the debugger, but we can test
 ;;; that the function in *debugger-hook* is properly called.
diff --git a/conditions/load.lsp b/conditions/load.lsp
index 31a162da0251fbba061f8cbb093754c596f989a4..736452e5a844a2ed7fecaf759c2623056c928dd0 100644
--- a/conditions/load.lsp
+++ b/conditions/load.lsp
@@ -2,7 +2,11 @@
 (compile-and-load "ANSI-TESTS:AUX;types-aux.lsp")
 (compile-and-load "ANSI-TESTS:AUX;define-condition-aux.lsp")
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "condition.lsp")
   (load "cell-error-name.lsp")
   (load "assert.lsp")
diff --git a/conditions/make-condition.lsp b/conditions/make-condition.lsp
index ace4097dcfc9988392eeb4b54c6ffa868fa67f35..f81fd732cee67e404245bea06a8b2c9e31f50854 100644
--- a/conditions/make-condition.lsp
+++ b/conditions/make-condition.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Jun 23 11:54:10 2005
 ;;;; Contains: Tests of MAKE-CONDITION
 
-(in-package :cl-test)
+
 
 
 (deftest make-condition.1
diff --git a/conditions/muffle-warning.lsp b/conditions/muffle-warning.lsp
index f09b57ad8064c92d571dadc74f26e0e7f794e900..291656cd9cfe9a0c7c29e286b94cdbf86d915a1d 100644
--- a/conditions/muffle-warning.lsp
+++ b/conditions/muffle-warning.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Mar 23 08:46:05 2003
 ;;;; Contains: Tests of the MUFFLE-WARNING restart and function
 
-(in-package :cl-test)
+
 
 (deftest muffle-warning.1
   (restart-case
diff --git a/conditions/restart-bind.lsp b/conditions/restart-bind.lsp
index 152fb91e500508496bfd2491ce094fcfea58a622..cd5e22d490a931317f02843396c808cbeb89e965 100644
--- a/conditions/restart-bind.lsp
+++ b/conditions/restart-bind.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Mar 21 22:28:53 2003
 ;;;; Contains: Tests for RESTART-BIND
 
-(in-package :cl-test)
+
 
 (deftest restart-bind.1
   (restart-bind () nil)
diff --git a/conditions/restart-case.lsp b/conditions/restart-case.lsp
index 4137ca73e6bfd805dbf8cccc6e3d7cc2ad2d611d..b11424b9d5f59881660d973896b9720ed5028f38 100644
--- a/conditions/restart-case.lsp
+++ b/conditions/restart-case.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Mar 22 06:58:03 2003
 ;;;; Contains: Tests for RESTART-CASE
 
-(in-package :cl-test)
+
 
 (deftest restart-case.1
   (restart-case (values)))
diff --git a/conditions/store-value.lsp b/conditions/store-value.lsp
index 464f4e49308a7c9d9675066fd43bb309354dde5b..3901a14aee202873d433190129ccdb9f13a3bbdb 100644
--- a/conditions/store-value.lsp
+++ b/conditions/store-value.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Mar 23 09:10:22 2003
 ;;;; Contains: Tests for STORE-VALUE restart and function
 
-(in-package :cl-test)
+
 
 (deftest store-value.1
   (restart-case
diff --git a/conditions/use-value.lsp b/conditions/use-value.lsp
index aca83b433b6df05709a7bc5007318695dbd32078..9c596337f0f707ada7ccdc0717d2b9e570d0bb43 100644
--- a/conditions/use-value.lsp
+++ b/conditions/use-value.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Mar 23 09:13:59 2003
 ;;;; Contains: Tests for USE-VALUE restart and function
 
-(in-package :cl-test)
+
 
 (deftest use-value.1
   (restart-case
diff --git a/conditions/warn.lsp b/conditions/warn.lsp
index 5d8cfb239329a8cd0eae273be9126ef36760e2b5..699cae8af7781aa7caba7d844df4dc42c18a1dde 100644
--- a/conditions/warn.lsp
+++ b/conditions/warn.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Feb 23 20:48:12 2003
 ;;;; Contains: Tests for WARN
 
-(in-package :cl-test)
+
 
 (deftest warn.1
   (let ((warned nil))
diff --git a/conditions/with-condition-restarts.lsp b/conditions/with-condition-restarts.lsp
index 655fa54c3ab39ac2da8a7b73152b0ace4cb51791..644776279739f887a92fe4c5020c359997b1f0a8 100644
--- a/conditions/with-condition-restarts.lsp
+++ b/conditions/with-condition-restarts.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Mar 23 04:06:06 2003
 ;;;; Contains: Tests of WITH-CONDITION-RESTARTS
 
-(in-package :cl-test)
+
 
 (deftest with-condition-restarts.1
   (let (a b c (i 0))
diff --git a/conditions/with-simple-restart.lsp b/conditions/with-simple-restart.lsp
index 49207ea95fea695a852aab2fe9125d626a25ed54..4f4a71236754ef1cc04fc67c83083add687b24b8 100644
--- a/conditions/with-simple-restart.lsp
+++ b/conditions/with-simple-restart.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Mar 23 04:36:52 2003
 ;;;; Contains: Tests for WITH-SIMPLE-RESTART
 
-(in-package :cl-test)
+
 
 (deftest with-simple-restart.1
   (with-simple-restart (foo ""))
diff --git a/cons/acons.lsp b/cons/acons.lsp
index 62424ec0d81e83c8633ac8db8414a86ef0575b3b..6025153858f0be3293fc723987ddd207fa477de6 100644
--- a/cons/acons.lsp
+++ b/cons/acons.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:26:48 2003
 ;;;; Contains: Tests of ACONS
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/adjoin.lsp b/cons/adjoin.lsp
index ca9fe74c5472585f80e8698cbfd7723493633fa8..bb33f032ad7fa22eb2fda7050d38dabd7c52cc95 100644
--- a/cons/adjoin.lsp
+++ b/cons/adjoin.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Mar 28 07:33:20 1998
 ;;;; Contains:  Tests of ADJOIN
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/append.lsp b/cons/append.lsp
index b80f124498e30560cad7963b9276ea738a41f4fb..ff4933aef99db2cc40adb97fefe3219044280483 100644
--- a/cons/append.lsp
+++ b/cons/append.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 22:36:46 2003
 ;;;; Contains: Tests of APPEND
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/assoc-if-not.lsp b/cons/assoc-if-not.lsp
index 2586776cd887b2587b1b629d08ae830e24ca16e5..6a53e99f2b4afb975100d09c3f758c95f68f5b44 100644
--- a/cons/assoc-if-not.lsp
+++ b/cons/assoc-if-not.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:28:37 2003
 ;;;; Contains: Tests of ASSOC-IF-NOT
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/assoc-if.lsp b/cons/assoc-if.lsp
index 2372b92a017ce34505a8646e3f3bd21726ea8cdf..48723f11ddfa5bc861f45a1451718cf2c4a81dee 100644
--- a/cons/assoc-if.lsp
+++ b/cons/assoc-if.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:27:57 2003
 ;;;; Contains: Tests of ASSOC-IF
 
-(in-package :cl-test)
+
 
 (deftest assoc-if.1
     (let* ((x (copy-list '((1 . a) (3 . b) (6 . c) (7 . d))))
diff --git a/cons/assoc.lsp b/cons/assoc.lsp
index 78a08bd50fb6750f3a9c1eef054209d048299cdc..bbe38bb3c1f4ec2faaf099066357956f5ce3a80e 100644
--- a/cons/assoc.lsp
+++ b/cons/assoc.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:27:20 2003
 ;;;; Contains: Tests of ASSOC
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/atom.lsp b/cons/atom.lsp
index 3c825f42e55f7a27145dab562a0904d18d90ab53..85a0759eb9fad3eee15be6f2972cddd09e3d5e04 100644
--- a/cons/atom.lsp
+++ b/cons/atom.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 21:28:09 2003
 ;;;; Contains: Tests of ATOM
 
-(in-package :cl-test)
+
 
 (deftest atom.1
   (loop for x in *universe*
diff --git a/cons/butlast.lsp b/cons/butlast.lsp
index 577db6d3dd474cf9459218e32ff709fc3cb0c788..86e3fe710720fd02139b800c71f8738dd9382878 100644
--- a/cons/butlast.lsp
+++ b/cons/butlast.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 22:41:14 2003
 ;;;; Contains: Tests of BUTLAST
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/cons-test-01.lsp b/cons/cons-test-01.lsp
index d839d49f0c25094fabc7e26ec4e977afaef20795..1c64cfc51fa7c38d5e938d08075f1f699d73aafd 100644
--- a/cons/cons-test-01.lsp
+++ b/cons/cons-test-01.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Mar 28 07:29:48 1998
 ;;;; Contains: Testing of CL Features related to "CONS", part 1
 
-(in-package :cl-test)
+
 
 (declaim (optimize (safety 3)))
 
diff --git a/cons/cons-test-03.lsp b/cons/cons-test-03.lsp
index facd8666996d59372098c7dc21c11fb30bb66e1d..b94f82b56454c1b5f67bbb49c8cba83fef4e22d1 100644
--- a/cons/cons-test-03.lsp
+++ b/cons/cons-test-03.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Mar 28 07:32:20 1998
 ;;;; Contains: Testing of CL Features related to "CONS", part 3
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/cons-test-05.lsp b/cons/cons-test-05.lsp
index c7df1bcd89ab24f1be920b5cb09716bb14603ba4..ef433b37725201e4951afcfded4badf7a856cad9 100644
--- a/cons/cons-test-05.lsp
+++ b/cons/cons-test-05.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Mar 28 07:34:08 1998
 ;;;; Contains:  Testing of CL Features related to "CONS", part 5
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/cons.lsp b/cons/cons.lsp
index f8c90a39a8f578d84b8513d8029c33f923d14c37..3882f99fec474c8e31f301082885ad0dd4f391c4 100644
--- a/cons/cons.lsp
+++ b/cons/cons.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 21:24:25 2003
 ;;;; Contains: Tests for CONS
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/consp.lsp b/cons/consp.lsp
index 0b86de67fd83067f7a5729c9740d67c8919ff4bc..e5b22c2120faf2fe1fc590f6e1e3b5f91b2e4bfc 100644
--- a/cons/consp.lsp
+++ b/cons/consp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 21:27:16 2003
 ;;;; Contains: Tests of CONSP
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/copy-alist.lsp b/cons/copy-alist.lsp
index beaeec9c6fe1da15454ad5bb2d3fe8ac4c695c05..2e0067dd041bae160ac18c9adf302ed3af34574e 100644
--- a/cons/copy-alist.lsp
+++ b/cons/copy-alist.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:29:07 2003
 ;;;; Contains: Tests of COPY-ALIST
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/copy-list.lsp b/cons/copy-list.lsp
index e1d0bb6f9c414a650af2907a2bb38a3fe800d03f..968661c693ba1370c7460b472ba4f80245215676 100644
--- a/cons/copy-list.lsp
+++ b/cons/copy-list.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 21:55:19 2003
 ;;;; Contains: Tests of COPY-LIST
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/copy-tree.lsp b/cons/copy-tree.lsp
index 769dca26d88a568a6a5555b88d6e57eaf4f866b5..2340ecabdeef16cad81f8852128d09d4706e9403 100644
--- a/cons/copy-tree.lsp
+++ b/cons/copy-tree.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 21:31:33 2003
 ;;;; Contains: Tests of COPY-TREE
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/cxr.lsp b/cons/cxr.lsp
index 63a9e6c73d2cfee6c39b08ab1d07b2717ffb98e2..2f27d9f507938ebedfc40ab8c0400c2c99f88692 100644
--- a/cons/cxr.lsp
+++ b/cons/cxr.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 21:28:38 2003
 ;;;; Contains: Tests of C*R functions
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/endp.lsp b/cons/endp.lsp
index 3e8e2540e0c789c48b9d4d22478c0aa786c8bc1f..7baea4593a882124492f20c60f58c41006f24ade 100644
--- a/cons/endp.lsp
+++ b/cons/endp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Mar 28 07:34:40 1998
 ;;;; Contains: Tests of ENDP
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/get-properties.lsp b/cons/get-properties.lsp
index fd265257e24cf19ae2bdd99c647f2a47ade1c77b..318b7073af6751a1a6c240c76ee988820db61dd3 100644
--- a/cons/get-properties.lsp
+++ b/cons/get-properties.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:37:00 2003
 ;;;; Contains: Tests of GET-PROPERTIES
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/getf.lsp b/cons/getf.lsp
index 533923f363e674f95f4930a1fb56fd2e4a8ac75a..da57dbf95df1cbce7dbfa7e8d110a6fd848b15cd 100644
--- a/cons/getf.lsp
+++ b/cons/getf.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:37:41 2003
 ;;;; Contains: Tests of GETF
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/intersection.lsp b/cons/intersection.lsp
index 826326b419801cae55e1ffc36bd95c66e7793981..7f3b0b24fbafc1568d7396b8e5a5fb15e23db3cb 100644
--- a/cons/intersection.lsp
+++ b/cons/intersection.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:39:19 2003
 ;;;; Contains: Tests of INTERSECTION
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/last.lsp b/cons/last.lsp
index dbb5b7e99013bddb10b47256e28e4610b5f686c2..56f36b8c1fc0fb0036baba9ec78b154b0a5a634d 100644
--- a/cons/last.lsp
+++ b/cons/last.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Mar 28 07:37:21 1998
 ;;;; Contains: Testing of CL Features related to "CONS", part 10
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/ldiff.lsp b/cons/ldiff.lsp
index 828853206f97b9a43547e9b2a637574462bc7162..f9ceacea9560263e6a07995c2d1c64a9c577554d 100644
--- a/cons/ldiff.lsp
+++ b/cons/ldiff.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 22:46:56 2003
 ;;;; Contains: Tests of LDIFF
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/list-length.lsp b/cons/list-length.lsp
index 9632d5b265def6b6f5159844ecfd9b3a2d8e1b62..80b5e50bb6f6dd2e7afdba3ca07e43bfc55aed9a 100644
--- a/cons/list-length.lsp
+++ b/cons/list-length.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 22:03:01 2003
 ;;;; Contains: Tests of LIST-LENGTH
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/list.lsp b/cons/list.lsp
index af3a767267eb146dd570f838079fbf7cb2647141..d58a2df6845ba56c31fb2d12daaae9312b750752 100644
--- a/cons/list.lsp
+++ b/cons/list.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 21:56:04 2003
 ;;;; Contains: Tests of LIST, LIST*
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/listp.lsp b/cons/listp.lsp
index ef5aef1c56b1e082a614b23de32732936a665705..e755d5d497442c0af669ffa71360c19c732327a3 100644
--- a/cons/listp.lsp
+++ b/cons/listp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 22:03:37 2003
 ;;;; Contains: Tests of LISTP
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/load.lsp b/cons/load.lsp
index 9f4e668855c63a2be788bf76bc5be6f7fbb24fb8..b3b496b5e2dd62df0d6bfbed20e92fcf927ed6d4 100644
--- a/cons/load.lsp
+++ b/cons/load.lsp
@@ -1,7 +1,11 @@
 ;;; Tests of conses
 (compile-and-load "ANSI-TESTS:AUX;cons-aux.lsp")
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "cons.lsp")
   (load "consp.lsp")
   (load "atom.lsp")
diff --git a/cons/make-list.lsp b/cons/make-list.lsp
index d9971ebd22c9f15ebe39fe62f708fa53cf3175df..4812ac68048689822b8bfc3a743a10af42eab80b 100644
--- a/cons/make-list.lsp
+++ b/cons/make-list.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 22:04:27 2003
 ;;;; Contains: Tests of MAKE-LIST
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/mapc.lsp b/cons/mapc.lsp
index 97f8ba21454e9ea2f8c2f2a491f2124a472e100f..262be668937c85542a4886e33f7ffa35c8f8142f 100644
--- a/cons/mapc.lsp
+++ b/cons/mapc.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:21:24 2003
 ;;;; Contains: Tests of MAPC
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/mapcan.lsp b/cons/mapcan.lsp
index 221e9c8ba9045b6efb07a708378b7bdb40af08aa..c321748529dc7bce8aed89791fdee861563939c7 100644
--- a/cons/mapcan.lsp
+++ b/cons/mapcan.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:22:46 2003
 ;;;; Contains: Tests of MAPCAN
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/mapcar.lsp b/cons/mapcar.lsp
index bd59424f847c37782a16fe40d1b01e0ecf8bbedd..14af63897857137d762468bedcad7a6979d4d307 100644
--- a/cons/mapcar.lsp
+++ b/cons/mapcar.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:22:16 2003
 ;;;; Contains: Tests of MAPCAR
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/mapcon.lsp b/cons/mapcon.lsp
index ce307ee2bb6b577630ac5d6d81186b836da87c58..30016903909bed95479b16292b1d030c819d575c 100644
--- a/cons/mapcon.lsp
+++ b/cons/mapcon.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:24:28 2003
 ;;;; Contains: Tests of MAPCON
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/mapl.lsp b/cons/mapl.lsp
index 187beca089b14b30a5ababfa25dbb5d6b7a1a9a5..cb1f24984503192e6a455da4bcdb1ddce3a41f31 100644
--- a/cons/mapl.lsp
+++ b/cons/mapl.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:23:23 2003
 ;;;; Contains: Tests of MAPL
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/maplist.lsp b/cons/maplist.lsp
index 78eb8b35cecd4cc4e65892e7caf796ae6281c604..5a2d58927d45d6f3fdb8e0ad650ed161515ceceb 100644
--- a/cons/maplist.lsp
+++ b/cons/maplist.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:24:00 2003
 ;;;; Contains: Tests of MAPLIST
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/member-if-not.lsp b/cons/member-if-not.lsp
index 83ec8016f15fc05edfa2da89a1449c4735c26743..ee4e8ca73977ca5e5de24270d594cec8c143bf8e 100644
--- a/cons/member-if-not.lsp
+++ b/cons/member-if-not.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Mar 28 07:39:29 1998
 ;;;; Contains: Tests of MEMBER-IF-NOT
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/member-if.lsp b/cons/member-if.lsp
index 04228ee5814f97cb1522feaa442396a1f772924e..2c21363163e776ad0a4c6e51d4ef6bcc0e03b139 100644
--- a/cons/member-if.lsp
+++ b/cons/member-if.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 22:51:56 2003
 ;;;; Contains: Tests of MEMBER-IF
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/member.lsp b/cons/member.lsp
index ce6684ccd346bfce3d5336e55e0ccda4e9397d9c..7aaaa8c0d906ab75cbf0d9310fbbd4847560dd24 100644
--- a/cons/member.lsp
+++ b/cons/member.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Mar 28 07:38:57 1998
 ;;;; Contains: Tests of MEMBER
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/nbutlast.lsp b/cons/nbutlast.lsp
index c72b492b1a3bffda076ace8a1b69e43868ab242b..ceaddb4959594a8fa76c9f0f2c30381a32601c9c 100644
--- a/cons/nbutlast.lsp
+++ b/cons/nbutlast.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 22:41:54 2003
 ;;;; Contains: Tests of NBUTLAST
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/nconc.lsp b/cons/nconc.lsp
index f337338c427326477dfde45b9ee1a70a3baa50a2..187a26b18d75bedcb3cc49d58bd74ee270bbf87a 100644
--- a/cons/nconc.lsp
+++ b/cons/nconc.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 22:35:53 2003
 ;;;; Contains: Tests of NCONC
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/nintersection.lsp b/cons/nintersection.lsp
index 88c5009915e1a430402c5cff54fb4e1d0acdeed1..6cc8d93f6027f41428a6f11b509810347ef2bfee 100644
--- a/cons/nintersection.lsp
+++ b/cons/nintersection.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:40:02 2003
 ;;;; Contains: Tests of NINTERSECTION
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/nreconc.lsp b/cons/nreconc.lsp
index 51b2303d2e1a912d6bf8a7e59e80eb74484531fd..2f99868d957c91e2b7db66c5a6a1d27d00f7010e 100644
--- a/cons/nreconc.lsp
+++ b/cons/nreconc.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 22:38:12 2003
 ;;;; Contains: Tests of NRECONC
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/nset-difference.lsp b/cons/nset-difference.lsp
index 77bdb2d628af08747985e1a8aee737b7d3d559a6..0cabd8069d52eea36bb0a8536198c426b386e77a 100644
--- a/cons/nset-difference.lsp
+++ b/cons/nset-difference.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:44:44 2003
 ;;;; Contains: Tests of NSET-DIFFERENCE
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/nset-exclusive-or.lsp b/cons/nset-exclusive-or.lsp
index 7252e31c5b982ccb5fec43045b7672aa99e6e1b0..2cbc031afa7171120e491996ee1b555856fba479 100644
--- a/cons/nset-exclusive-or.lsp
+++ b/cons/nset-exclusive-or.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:47:05 2003
 ;;;; Contains: Tests of NSET-EXCLUSIVE-OR
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/nsublis.lsp b/cons/nsublis.lsp
index afc15be451baf6f305424f9181f9eba1becf7830..6b1c9764c01b20949b8048ea657ec37955714035 100644
--- a/cons/nsublis.lsp
+++ b/cons/nsublis.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 21:35:33 2003
 ;;;; Contains: Tests of NSUBLIS
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/nsubst-if-not.lsp b/cons/nsubst-if-not.lsp
index 4ecf9e8f2a147c23e24ada995fb599eeadee343d..2b010c838f95b695f2807d578903891a425e9a19 100644
--- a/cons/nsubst-if-not.lsp
+++ b/cons/nsubst-if-not.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 21:54:12 2003
 ;;;; Contains: Tests of NSUBST-IF-NOT
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/nsubst-if.lsp b/cons/nsubst-if.lsp
index 74bd5790f3f3b087d55a99cae9707d52e739020a..d6e6ec41104217fcff5a144c85185db8e7df2062 100644
--- a/cons/nsubst-if.lsp
+++ b/cons/nsubst-if.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 21:51:41 2003
 ;;;; Contains: Tests of NSUBST-IF
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/nsubst.lsp b/cons/nsubst.lsp
index 4788ab63fa87cbfc26dccb6e363cde31e7273cc6..b762db664afd60d09ef301999003271fb61f56e2 100644
--- a/cons/nsubst.lsp
+++ b/cons/nsubst.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 21:49:58 2003
 ;;;; Contains: Tests of NSUBST
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/nth.lsp b/cons/nth.lsp
index 5aa3b517d6f0db5d4641eaad21630dd906405241..8b756014b771562c43133870cc9b337135be0d52 100644
--- a/cons/nth.lsp
+++ b/cons/nth.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 22:33:23 2003
 ;;;; Contains: Tests of NTH
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/nthcdr.lsp b/cons/nthcdr.lsp
index 5b73e4c9427cc786b3a1abbcd76b72061e5c3856..52221f156705e7052690bdc59bee2803b4133b4a 100644
--- a/cons/nthcdr.lsp
+++ b/cons/nthcdr.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 22:48:36 2003
 ;;;; Contains: Tests of NTHCDR
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/nunion.lsp b/cons/nunion.lsp
index 018b77fe688f4b41f57f9c0216a475a81cb4ccb9..f89812ae9da046b755e7266aa9433733d6b51ca4 100644
--- a/cons/nunion.lsp
+++ b/cons/nunion.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:42:35 2003
 ;;;; Contains: Tests of NUNION
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/pairlis.lsp b/cons/pairlis.lsp
index e9d35478f5d5c2af46c2c98ec843174d3743f7d3..86c44242528b15e646e45890ea38d09543cbc56d 100644
--- a/cons/pairlis.lsp
+++ b/cons/pairlis.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:30:55 2003
 ;;;; Contains: Tests of PAIRLIS
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/pop.lsp b/cons/pop.lsp
index 6c0f186e83efeb9998eb01c8d6446bfdabe45ee4..575149730ca7399c945cf74da7a0eb87e007d2dc 100644
--- a/cons/pop.lsp
+++ b/cons/pop.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 22:27:18 2003
 ;;;; Contains: Tests of POP
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/push.lsp b/cons/push.lsp
index a8d9d4da8e9bf65250196caa454c0666c80576e4..1ec98f99090835cebb280fae5233ed0409324c4e 100644
--- a/cons/push.lsp
+++ b/cons/push.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 22:05:34 2003
 ;;;; Contains: Tests of PUSH
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/pushnew.lsp b/cons/pushnew.lsp
index dac46e79a07ad8ba93bf72eef9933c0ec7572996..57d0030a8697bab00af5887fc4ba925b101907a2 100644
--- a/cons/pushnew.lsp
+++ b/cons/pushnew.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 22:28:35 2003
 ;;;; Contains: Tests of PUSHNEW
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/rassoc-if-not.lsp b/cons/rassoc-if-not.lsp
index 365ed61fcefe3277b1e2ed973639c2412da7eaf9..cef3097606677ff513746035c812b734c1e76cff 100644
--- a/cons/rassoc-if-not.lsp
+++ b/cons/rassoc-if-not.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:35:27 2003
 ;;;; Contains: Tests of RASSOC-IF-NOT
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/rassoc-if.lsp b/cons/rassoc-if.lsp
index 5f879fe2dedaa9f961e31436396ac33dfe00a41c..240fa5202be62cee38d8eb4c5a47b5fc4d72de19 100644
--- a/cons/rassoc-if.lsp
+++ b/cons/rassoc-if.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:34:59 2003
 ;;;; Contains: Tests of RASSOC-IF
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/rassoc.lsp b/cons/rassoc.lsp
index 81ae1c00dab3b7dc00520c978e3e0b16f4aa572b..641034191e89e4c398d98bde5724cf70032bdd70 100644
--- a/cons/rassoc.lsp
+++ b/cons/rassoc.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:33:49 2003
 ;;;; Contains: Tests of RASSOC
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/remf.lsp b/cons/remf.lsp
index e7d09982a9698ca94020c5ebf2f28f79d0331fbd..fab804f9ffe61a7f829842d416c37fb79d7d9b84 100644
--- a/cons/remf.lsp
+++ b/cons/remf.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:38:18 2003
 ;;;; Contains: Tests of REMF
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/rest.lsp b/cons/rest.lsp
index c758314e6a4030f0566343fccc42318d839269a8..ef16a8a150171f409cfc24d250f0a265103e4d99 100644
--- a/cons/rest.lsp
+++ b/cons/rest.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 22:49:14 2003
 ;;;; Contains: Tests of REST
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/revappend.lsp b/cons/revappend.lsp
index 1c16f204657b967b63d21ec7a3f6551291fcfd9e..2142f55b5c3e8411296a9df95dee08b4f42b198a 100644
--- a/cons/revappend.lsp
+++ b/cons/revappend.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 22:37:43 2003
 ;;;; Contains: Tests of REVAPPEND
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/rplaca.lsp b/cons/rplaca.lsp
index eddf7647e95180fc7c31a93a998513890a214ab4..4ef8a9e648bf46b27e94a2ba88a6187f0872e94b 100644
--- a/cons/rplaca.lsp
+++ b/cons/rplaca.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 21:29:43 2003
 ;;;; Contains: Tests of RPLACA
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/rplacd.lsp b/cons/rplacd.lsp
index 0744d717f687006bd20478ca1d8f1b11fa098fbb..76b77600484490127fa0fdc0ce4f6f2e2507fb18 100644
--- a/cons/rplacd.lsp
+++ b/cons/rplacd.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 21:30:28 2003
 ;;;; Contains: Tests of RPLACD
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/set-difference.lsp b/cons/set-difference.lsp
index 803242a9941b189eb5795bb73aaf9c0ebcee85fc..569863ef0bfd8ed7a4b6d41cef8d968d11fdb9bf 100644
--- a/cons/set-difference.lsp
+++ b/cons/set-difference.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:44:06 2003
 ;;;; Contains: Tests of SET-DIFFERENCE
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/set-exclusive-or.lsp b/cons/set-exclusive-or.lsp
index f4ebc5cc7fb09ccf452652d1fb277441730073e6..dde380f3f4be793a9dd795510bf25e35096f005d 100644
--- a/cons/set-exclusive-or.lsp
+++ b/cons/set-exclusive-or.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:45:46 2003
 ;;;; Contains: Tests of SET-EXCLUSIVE-OR
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/sublis.lsp b/cons/sublis.lsp
index 9b231e855ad977898bf5d8d5ac0672357b709d6b..426203effbffb2ad50f3cc8853d716bb8ee58fdd 100644
--- a/cons/sublis.lsp
+++ b/cons/sublis.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 21:32:50 2003
 ;;;; Contains: Tests of SUBLIS
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/subsetp.lsp b/cons/subsetp.lsp
index 7e2793175aaa50c28d642e6c0e48072377884c73..b1e5a3239d027b1497f786f980df4d5439184e55 100644
--- a/cons/subsetp.lsp
+++ b/cons/subsetp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Apr  1 22:10:54 1998
 ;;;; Contains: Tests of SUBSETP
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/subst-if-not.lsp b/cons/subst-if-not.lsp
index 741c18bcbc325ffbd5ae1eb9298aae41a24beee7..8cf5fdd24a3d1f9fd82098f97df49712bf3a135a 100644
--- a/cons/subst-if-not.lsp
+++ b/cons/subst-if-not.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 21:48:22 2003
 ;;;; Contains: Tests of SUBST-IF-NOT
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/subst-if.lsp b/cons/subst-if.lsp
index cc18745b701adca821f32e707612f604e27c4ffe..33168058b298fa196df273ee616953f523198cca 100644
--- a/cons/subst-if.lsp
+++ b/cons/subst-if.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 21:39:42 2003
 ;;;; Contains: Tests of SUBST-IF
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/subst.lsp b/cons/subst.lsp
index 54228aed8dc531ed21944eb870346a3728fb39be..03d13225e7853b6dff02d41654b34da3592eea71 100644
--- a/cons/subst.lsp
+++ b/cons/subst.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 21:37:56 2003
 ;;;; Contains: Tests of SUBST
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/tailp.lsp b/cons/tailp.lsp
index 56f20cab101807cccad1870add63bb586bdb3b5b..1b4b4c5e6a6e285f8892a3b716597002593458c7 100644
--- a/cons/tailp.lsp
+++ b/cons/tailp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 19 22:47:26 2003
 ;;;; Contains: Tests of TAILP
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/tree-equal.lsp b/cons/tree-equal.lsp
index a7e4a4a82f45d9f1412cae48c7223a4c3e799bc6..469ebabfee5e02c14e01832e46ee408149a54419 100644
--- a/cons/tree-equal.lsp
+++ b/cons/tree-equal.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Jun 14 07:23:03 2003
 ;;;; Contains: Tests of TREE-EQUAL
 
-(in-package :cl-test)
+
 
 
 
diff --git a/cons/union.lsp b/cons/union.lsp
index 489d62b4a666d6efdfba0ea64e168756e7437499..04b7d8167bd52d1ec52c09e8df000ffb827290f2 100644
--- a/cons/union.lsp
+++ b/cons/union.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 07:41:24 2003
 ;;;; Contains: Tests of UNION
 
-(in-package :cl-test)
+
 
 
 
diff --git a/data-and-control-flow/and.lsp b/data-and-control-flow/and.lsp
index 3046d09b29a0de854fb00316b2eace3b5d90cfbf..304f18aac270ddfe7b33b6a04870dcf91c651347 100644
--- a/data-and-control-flow/and.lsp
+++ b/data-and-control-flow/and.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Oct 18 07:23:48 2002
 ;;;; Contains: Tests for AND
 
-(in-package :cl-test)
+
 
 (deftest and.1
   (and)
diff --git a/data-and-control-flow/apply.lsp b/data-and-control-flow/apply.lsp
index ca004dfc25b2b5058b327db98d09d2d6adc0b40a..662292507ba5ad311983f90d920c2a61d7b1269b 100644
--- a/data-and-control-flow/apply.lsp
+++ b/data-and-control-flow/apply.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Jan 13 15:13:07 2003
 ;;;; Contains: Tests of APPLY
 
-(in-package :cl-test)
+
 
 ;;; Error cases
 
diff --git a/data-and-control-flow/block.lsp b/data-and-control-flow/block.lsp
index 2b41460c373524efa69731bea44d395bf58ae47e..fa802f96744b8c69603d3e179fc4de184aa94dcd 100644
--- a/data-and-control-flow/block.lsp
+++ b/data-and-control-flow/block.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Oct 12 12:30:46 2002
 ;;;; Contains: Tests of BLOCK
 
-(in-package :cl-test)
+
 
 (deftest block.1
   (block foo
diff --git a/data-and-control-flow/call-arguments-limit.lsp b/data-and-control-flow/call-arguments-limit.lsp
index ac178951a3bc0fa31ae11ebf5a61d32f4b0083e1..1c27e125885c813f5b13c7069beae3c11f1b4cec 100644
--- a/data-and-control-flow/call-arguments-limit.lsp
+++ b/data-and-control-flow/call-arguments-limit.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Oct 10 22:39:25 2002
 ;;;; Contains: Tests for CALL-ARGUMENTS-LIMIT
 
-(in-package :cl-test)
+
 
 (deftest call-arguments-limit.1
   (notnot-mv (constantp 'call-arguments-limit))
diff --git a/data-and-control-flow/case.lsp b/data-and-control-flow/case.lsp
index 3238d003bbb9d0c690e76f9f29bf7c885eb37712..8ead5703708ef839555025e40e4a90f8674f58df 100644
--- a/data-and-control-flow/case.lsp
+++ b/data-and-control-flow/case.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Oct 18 19:56:44 2002
 ;;;; Contains: Tests of CASE
 
-(in-package :cl-test)
+
 
 (deftest case.1
   (case 'a)
diff --git a/data-and-control-flow/catch.lsp b/data-and-control-flow/catch.lsp
index a98931dcc0015218bc8158134a7fb8a184a6e1a5..bd7d43569197e84d9b7ea3053eedda4cf7c9d487 100644
--- a/data-and-control-flow/catch.lsp
+++ b/data-and-control-flow/catch.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Oct 12 13:04:02 2002
 ;;;; Contains: Tests of CATCH and THROW
 
-(in-package :cl-test)
+
 
 (deftest catch.1
   (catch 'foo)
diff --git a/data-and-control-flow/ccase.lsp b/data-and-control-flow/ccase.lsp
index 0ef08422b6189966ec09e75783355f81d8c9474f..25914b9edcb5f26c7c9d4f164f148de8a5ef260f 100644
--- a/data-and-control-flow/ccase.lsp
+++ b/data-and-control-flow/ccase.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Oct 18 21:06:45 2002
 ;;;; Contains: Tests of CCASE
 
-(in-package :cl-test)
+
 
 (deftest ccase.1
   (let ((x 'b))
diff --git a/data-and-control-flow/compiled-function-p.lsp b/data-and-control-flow/compiled-function-p.lsp
index d98489fdd9b89aa987920c709636c18460638044..e6ac92bd92906af078ae6e9069fbad3e1a3bca44 100644
--- a/data-and-control-flow/compiled-function-p.lsp
+++ b/data-and-control-flow/compiled-function-p.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Jan 13 16:32:44 2003
 ;;;; Contains: Tests of COMPILED-FUNCTION-P
 
-(in-package :cl-test)
+
 
 (deftest compiled-function-p.1
   (check-type-predicate #'compiled-function-p 'compiled-function)
diff --git a/data-and-control-flow/complement.lsp b/data-and-control-flow/complement.lsp
index b442d47a75b9d56ddedc3106f3cd602d11a31a95..b37de56b221d66008698a3dd7e6b2027977653ae 100644
--- a/data-and-control-flow/complement.lsp
+++ b/data-and-control-flow/complement.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Oct  6 20:04:33 2002
 ;;;; Contains: Tests for COMPLEMENT
 
-(in-package :cl-test)
+
 
 (deftest complement.1
   (notnot-mv (funcall (complement #'identity) nil))
diff --git a/data-and-control-flow/cond.lsp b/data-and-control-flow/cond.lsp
index 1eaabefed83aab29b88a18da3a0f3c03235909fb..d5832105a184f5b900d811dfb734c2a7033d8618 100644
--- a/data-and-control-flow/cond.lsp
+++ b/data-and-control-flow/cond.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Oct 18 07:37:58 2002
 ;;;; Contains: Tests of COND
 
-(in-package :cl-test)
+
 
 (deftest cond.1
   (cond)
diff --git a/data-and-control-flow/constantly.lsp b/data-and-control-flow/constantly.lsp
index 55dce3abc6f96981dd0bac65de8f23098a7e0ea5..02e5d680484b43d28fe4c5862b43a743190abab7 100644
--- a/data-and-control-flow/constantly.lsp
+++ b/data-and-control-flow/constantly.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Oct  6 19:47:16 2002
 ;;;; Contains: Tests for CONSTANTLY
 
-(in-package :cl-test)
+
 
 (deftest constantly.1
   (let ((fn (cl:constantly 10))
diff --git a/data-and-control-flow/ctypecase.lsp b/data-and-control-flow/ctypecase.lsp
index 15404adb6e514562097713ad0bba28ef03d934a0..08dbe9589e4c19251fe72e11eec1711a45acf371 100644
--- a/data-and-control-flow/ctypecase.lsp
+++ b/data-and-control-flow/ctypecase.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Oct 18 23:05:10 2002
 ;;;; Contains: Tests of CTYPECASE
 
-(in-package :cl-test)
+
 
 (deftest ctypecase.1
   (let ((x 1))
diff --git a/data-and-control-flow/data-and-control-flow.lsp b/data-and-control-flow/data-and-control-flow.lsp
index adcd4290c21787bb06dd98110b5b14dac836c557..550703ea2e5182620b675c99ba558958208655c1 100644
--- a/data-and-control-flow/data-and-control-flow.lsp
+++ b/data-and-control-flow/data-and-control-flow.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Oct 21 22:21:48 2002
 ;;;; Contains: Overall tests for section 5 of spec, "Data and Control Flow"
 
-(in-package :cl-test)
+
 
 ;;; Functions from section 5
 (defparameter *dcf-fns*
diff --git a/data-and-control-flow/defconstant.lsp b/data-and-control-flow/defconstant.lsp
index 9e3a08ac42c5fcbc62cefff1ea0ede3c64d24b5f..1402b19b50c499298d4eea062f1f5b0ade6d64ba 100644
--- a/data-and-control-flow/defconstant.lsp
+++ b/data-and-control-flow/defconstant.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Oct 10 23:05:39 2002
 ;;;; Contains: Tests of DEFCONSTANT
 
-(in-package :cl-test)
+
 
 (defconstant test-constant-1  17)
 
diff --git a/data-and-control-flow/define-modify-macro.lsp b/data-and-control-flow/define-modify-macro.lsp
index 606fda141088c637d7fc15ef531428d4b95bf9db..27b3a898604ca99eb84036d8cb1c317abe7b8e8c 100644
--- a/data-and-control-flow/define-modify-macro.lsp
+++ b/data-and-control-flow/define-modify-macro.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Oct 19 11:42:14 2002
 ;;;; Contains: Tests of DEFINE-MODIFY-MACRO
 
-(in-package :cl-test)
+
 
 (deftest define-modify-macro.1
   (values
diff --git a/data-and-control-flow/define-setf-expander.lsp b/data-and-control-flow/define-setf-expander.lsp
index 6552ecfbc589ab20bff34da9ab10a1115aa72577..94a595ecea5d02694e1a86bbc94172a2d697293e 100644
--- a/data-and-control-flow/define-setf-expander.lsp
+++ b/data-and-control-flow/define-setf-expander.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 17:19:35 2003
 ;;;; Contains: Tests of DEFINE-SETF-EXPANDER
 
-(in-package :cl-test)
+
 
 (def-macro-test define-setf-expander.error.1
   (define-setf-expander nonexistent-access-fn (x)))
diff --git a/data-and-control-flow/defparameter.lsp b/data-and-control-flow/defparameter.lsp
index 729f3a6bb80f5b51cd484db94f93aae5416b08ce..bfdf4b4f260e7d8a9d7ef1a38c3fc26b615bb8fb 100644
--- a/data-and-control-flow/defparameter.lsp
+++ b/data-and-control-flow/defparameter.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Oct 10 23:13:22 2002
 ;;;; Contains: Tests of DEFPARAMETER
 
-(in-package :cl-test)
+
 
 (defparameter *defparameter-test-var-1* 100)
 
diff --git a/data-and-control-flow/defsetf.lsp b/data-and-control-flow/defsetf.lsp
index 6d865c9b8de0a893dc9cdfb929b79e1358da7754..89d5c58ecf1940e700baa1ff26a8175ec378981b 100644
--- a/data-and-control-flow/defsetf.lsp
+++ b/data-and-control-flow/defsetf.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 17:18:01 2003
 ;;;; Contains: Tests of DEFSETF
 
-(in-package :cl-test)
+
 
 ;;; Need to add non-error tests
 
diff --git a/data-and-control-flow/defun.lsp b/data-and-control-flow/defun.lsp
index 794fca0f746eb559a08d8826d91d1cd0aa6a82ab..64801ef12c1bd04569b25de834d8c56a63c31dd5 100644
--- a/data-and-control-flow/defun.lsp
+++ b/data-and-control-flow/defun.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Feb 16 23:40:32 2003
 ;;;; Contains: Tests of DEFUN
 
-(in-package :cl-test)
+
 
 
 ;;; Tests for implicit blocks
diff --git a/data-and-control-flow/defvar.lsp b/data-and-control-flow/defvar.lsp
index de2beca2396a6d6a6078ad00d78310803b3d3889..da07fbe43b2b96e1717a6905a745e5d4483ec5f0 100644
--- a/data-and-control-flow/defvar.lsp
+++ b/data-and-control-flow/defvar.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Oct 10 23:21:50 2002
 ;;;; Contains: Tests for DEFVAR
 
-(in-package :cl-test)
+
 
 (defvar *defvar-test-var-1* 100)
 
diff --git a/data-and-control-flow/destructuring-bind.lsp b/data-and-control-flow/destructuring-bind.lsp
index 609726363eba0c2d5151bc97cf2c2a1daca57c5d..63aca788b835ee5eef7a06d8308424c245195f76 100644
--- a/data-and-control-flow/destructuring-bind.lsp
+++ b/data-and-control-flow/destructuring-bind.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Oct 10 23:25:50 2002
 ;;;; Contains: Tests for DESTRUCTURING-BIND
 
-(in-package :cl-test)
+
 
 ;;; See the page for this in section 5.3
 ;;; Also, see destructuring lambda lists in section 3.4.5
diff --git a/data-and-control-flow/ecase.lsp b/data-and-control-flow/ecase.lsp
index 8b7ed260f155aadc13543cd5aa1cebeba11e4271..c42adf04a9a0954078ad3a85b1ffa4a02f13f8e8 100644
--- a/data-and-control-flow/ecase.lsp
+++ b/data-and-control-flow/ecase.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Oct 18 20:17:30 2002
 ;;;; Contains: Tests for ECASE
 
-(in-package :cl-test)
+
 
 (deftest ecase.1
   (ecase 'b (a 1) (b 2) (c 3))
diff --git a/data-and-control-flow/eql.lsp b/data-and-control-flow/eql.lsp
index 2f7f529f9bc8bc6e628ee279e8740b9490061cb3..d0716e0438cb7cea4137a8542c2cab2814d7aad0 100644
--- a/data-and-control-flow/eql.lsp
+++ b/data-and-control-flow/eql.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Oct 17 19:36:33 2002
 ;;;; Contains: Tests of EQL
 
-(in-package :cl-test)
+
 
 ;;; EQLT is defined in ansi-aux.lsp
 ;;; It calls EQL, returning NIL when the result is false and T when it
diff --git a/data-and-control-flow/equal.lsp b/data-and-control-flow/equal.lsp
index 4d8bf8a1496584f70911f17ad6ec7323591d0090..aa70e86e326b53f521a2224215f7b7d89fbd4151 100644
--- a/data-and-control-flow/equal.lsp
+++ b/data-and-control-flow/equal.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Oct 17 21:38:16 2002
 ;;;; Contains: Tests for EQUAL
 
-(in-package :cl-test)
+
 
 (deftest equal.1
   (loop for x in *symbols*
diff --git a/data-and-control-flow/equalp.lsp b/data-and-control-flow/equalp.lsp
index 0f69993b98bb529d430cd02fbff820cf6f981819..de1bad0d7617dfd675d7d1473f3a3f14136dcdea 100644
--- a/data-and-control-flow/equalp.lsp
+++ b/data-and-control-flow/equalp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Oct 17 22:14:42 2002
 ;;;; Contains: Tests for EQUALP
 
-(in-package :cl-test)
+
 
 (deftest equalp.1
   (loop for c across +base-chars+
diff --git a/data-and-control-flow/etypecase.lsp b/data-and-control-flow/etypecase.lsp
index 2a6ab1ca1fd85a34ac7103863b49de1f91c9a7f2..746c43e9a4bbec3e283269ffac7ab2f68658f7e0 100644
--- a/data-and-control-flow/etypecase.lsp
+++ b/data-and-control-flow/etypecase.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Oct 18 23:02:23 2002
 ;;;; Contains: Tests of ETYPECASE
 
-(in-package :cl-test)
+
 
 (deftest etypecase.1
   (etypecase 1 (integer 'a) (t 'b))
diff --git a/data-and-control-flow/every.lsp b/data-and-control-flow/every.lsp
index 93e9567bcae093cb98b67f06659227b479d55671..b23ada421097152317fd930b15d4238e79bb2775 100644
--- a/data-and-control-flow/every.lsp
+++ b/data-and-control-flow/every.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Oct 17 23:25:58 2002
 ;;;; Contains: Tests of EVERY
 
-(in-package :cl-test)
+
 
 (deftest every.1
   (notnot-mv (every #'identity nil))
diff --git a/data-and-control-flow/fboundp.lsp b/data-and-control-flow/fboundp.lsp
index 2a7f84eff41b4fbdd369a1c5425e2a3a6afbe66a..dfe6b9e48affea4bda9cd34d96f63e37c9840ab9 100644
--- a/data-and-control-flow/fboundp.lsp
+++ b/data-and-control-flow/fboundp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Oct  7 22:37:22 2002
 ;;;; Contains: Tests of FBOUNDP
 
-(in-package :cl-test)
+
 
 (deftest fboundp.1
   (not-mv (fboundp 'car))
diff --git a/data-and-control-flow/fdefinition.lsp b/data-and-control-flow/fdefinition.lsp
index 3796bbda4ec83bebce6387705fb67fa1a58e8962..67538ac18798947233cfad456c6f98da2d518e7a 100644
--- a/data-and-control-flow/fdefinition.lsp
+++ b/data-and-control-flow/fdefinition.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Jan 13 15:27:51 2003
 ;;;; Contains: Tests for FDEFINITION
 
-(in-package :cl-test)
+
 
 ;;; Error cases
 
diff --git a/data-and-control-flow/flet.lsp b/data-and-control-flow/flet.lsp
index 077b8a18ab637dc57593acfc2fc7c1bd44ce63f7..f4e0912042177640068fa1ef7795fca53ae9879e 100644
--- a/data-and-control-flow/flet.lsp
+++ b/data-and-control-flow/flet.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Oct  8 22:55:02 2002
 ;;;; Contains: Tests of FLET
 
-(in-package :cl-test)
+
 
 (deftest flet.1
   (flet ((%f () 1))
diff --git a/data-and-control-flow/fmakunbound.lsp b/data-and-control-flow/fmakunbound.lsp
index 0385032c394fef4ad09c2392da5c83c3bd06cc5f..213de5c9ed50ef24a251ea6c7e781944fdc10cec 100644
--- a/data-and-control-flow/fmakunbound.lsp
+++ b/data-and-control-flow/fmakunbound.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Oct  8 00:09:14 2002
 ;;;; Contains: Tests for FMAKUNBOUND
 
-(in-package :cl-test)
+
 
 (deftest fmakunbound.1
   (let ((g (gensym)))
diff --git a/data-and-control-flow/funcall.lsp b/data-and-control-flow/funcall.lsp
index c253b4477c12ded76588ee18b5567d195616bd33..6ded38ddc0bd4fe5858aba2e530b8fd956b3c670 100644
--- a/data-and-control-flow/funcall.lsp
+++ b/data-and-control-flow/funcall.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Oct  9 21:45:07 2002
 ;;;; Contains: Tests of FUNCALL
 
-(in-package :cl-test)
+
 
 (deftest funcall.1
   (let ((fn #'cons))
diff --git a/data-and-control-flow/function-lambda-expression.lsp b/data-and-control-flow/function-lambda-expression.lsp
index 137d13434588b5433b1146152c06f83c52d8363c..6a28294010e574ef74735678317b67b606b8213e 100644
--- a/data-and-control-flow/function-lambda-expression.lsp
+++ b/data-and-control-flow/function-lambda-expression.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Jan 13 16:27:12 2003
 ;;;; Contains: Tests for FUNCTION-LAMBDA-EXPRESSION
 
-(in-package :cl-test)
+
 
 (deftest function-lambda-expression.1
   (length
diff --git a/data-and-control-flow/function.lsp b/data-and-control-flow/function.lsp
index 6d70881cc937506fa9ce9194bf502f5a223c765a..d042875199877dd431c510893ec81503c5f3fb59 100644
--- a/data-and-control-flow/function.lsp
+++ b/data-and-control-flow/function.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Oct  7 07:34:29 2002
 ;;;; Contains: Tests for type FUNCTION and the special form FUNCTION
 
-(in-package :cl-test)
+
 
 ;;;
 ;;; Note! There are significant incompatibilities between CLTL1 and ANSI CL
diff --git a/data-and-control-flow/functionp.lsp b/data-and-control-flow/functionp.lsp
index 81d14408ad9743413548c0b106cd6025cf786310..dac567966235b3b685f09637c6b1d2668e663108 100644
--- a/data-and-control-flow/functionp.lsp
+++ b/data-and-control-flow/functionp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Oct  7 06:39:21 2002
 ;;;; Contains: Tests for FUNCTIONP
 
-(in-package :cl-test)
+
 
 ;;;
 ;;; Note!  FUNCTIONP and FUNCTION behave differently in ANSI CL than
diff --git a/data-and-control-flow/get-setf-expansion.lsp b/data-and-control-flow/get-setf-expansion.lsp
index e2b67354bd1d52d9ad2e34b7154127d484cce144..36d0c89f53ce099c05130c130891aa7164884a56 100644
--- a/data-and-control-flow/get-setf-expansion.lsp
+++ b/data-and-control-flow/get-setf-expansion.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Jan 13 17:05:17 2003
 ;;;; Contains: Tests for GET-SETF-EXPANSION
 
-(in-package :cl-test)
+
 
 (deftest get-setf-expansion.error.1
   (signals-error (get-setf-expansion) program-error)
diff --git a/data-and-control-flow/identity.lsp b/data-and-control-flow/identity.lsp
index 02fb021c4178b9dad1e19a755cd22cd287edc1f7..81a4816ee8e1356d17942393b63143204b6ec843 100644
--- a/data-and-control-flow/identity.lsp
+++ b/data-and-control-flow/identity.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Oct 17 23:21:11 2002
 ;;;; Contains: Tests for IDENTITY
 
-(in-package :cl-test)
+
 
 (deftest identity.1
   (check-predicate #'(lambda (x) (eqlt x (check-values (identity x)))))
diff --git a/data-and-control-flow/if.lsp b/data-and-control-flow/if.lsp
index 6f52974213a50aacbef0ba0d608b607e79e94109..5120a6ab99168fc73a535338c924eab4c6c2f4e3 100644
--- a/data-and-control-flow/if.lsp
+++ b/data-and-control-flow/if.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Oct 18 08:21:29 2002
 ;;;; Contains: Tests for IF
 
-(in-package :cl-test)
+
 
 (deftest if.1
   (if t 1 2)
diff --git a/data-and-control-flow/labels.lsp b/data-and-control-flow/labels.lsp
index 8c8a87a3a00fb725769d2647c8e73ba74b86caa2..47ee6c9dba80d054cd75adf291b41f7209e8960e 100644
--- a/data-and-control-flow/labels.lsp
+++ b/data-and-control-flow/labels.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Oct  9 19:06:33 2002
 ;;;; Contains: Tests of LABELS
 
-(in-package :cl-test)
+
 
 (deftest labels.1
   (labels ((%f () 1))
diff --git a/data-and-control-flow/lambda-list-keywords.lsp b/data-and-control-flow/lambda-list-keywords.lsp
index 12b0c5c7b00748dbf3714950ab4f63ca2af00fdb..1bd6daf5413a05cfd6bf72e369c3d68f73f0f72d 100644
--- a/data-and-control-flow/lambda-list-keywords.lsp
+++ b/data-and-control-flow/lambda-list-keywords.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Oct  7 22:11:31 2002
 ;;;; Contains: Tests for LAMBDA-LIST-KEYWORDS
 
-(in-package :cl-test)
+
 
 ;;; The variable is bound
 (deftest lambda-list-keywords.1
diff --git a/data-and-control-flow/lambda-parameters-limit.lsp b/data-and-control-flow/lambda-parameters-limit.lsp
index c886cf10b55a148be2de69dd11468d6cd16bbb79..d7397ff5c3353bb592f42bbcfa7327703aec6d12 100644
--- a/data-and-control-flow/lambda-parameters-limit.lsp
+++ b/data-and-control-flow/lambda-parameters-limit.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Oct 10 22:45:44 2002
 ;;;; Contains: Tests for LAMBDA-PARAMETERS-LIMIT
 
-(in-package :cl-test)
+
 
 (deftest lambda-parameters-limit.1
   (not (typep lambda-parameters-limit 'integer))
diff --git a/data-and-control-flow/let.lsp b/data-and-control-flow/let.lsp
index a0abb783a637763a825298f2e68e66e1b0babfde..a540136228cd95d68a6a630990375c436d90d3fe 100644
--- a/data-and-control-flow/let.lsp
+++ b/data-and-control-flow/let.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Oct 12 09:24:36 2002
 ;;;; Contains: Tests for LET, LET*
 
-(in-package :cl-test)
+
 
 ;;; LET and LET* are also heavily exercised in the many other tests.
 
diff --git a/data-and-control-flow/letstar.lsp b/data-and-control-flow/letstar.lsp
index 3b917d79f13d1974a3da4e05abf2159ede4f0934..9902095d68ae1d05ed4e3d69072226476a867486 100644
--- a/data-and-control-flow/letstar.lsp
+++ b/data-and-control-flow/letstar.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Jun 24 20:53:36 2005
 ;;;; Contains: Tests for LET*
 
-(in-package :cl-test)
+
 
 (deftest let*.1
   (let* ((x 0)) x)
diff --git a/data-and-control-flow/load.lsp b/data-and-control-flow/load.lsp
index 0daa05e8f15364690d53326bc100f3cc4f17f464..7e95673041ce9e00d90acdc7dae29ec863a84e86 100644
--- a/data-and-control-flow/load.lsp
+++ b/data-and-control-flow/load.lsp
@@ -3,7 +3,11 @@
 (compile-and-load "ANSI-TESTS:AUX;random-aux.lsp")
 (compile-and-load "ANSI-TESTS:AUX;types-aux.lsp")
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "data-and-control-flow.lsp")
   (load "places.lsp")
   (load "psetq.lsp")
@@ -80,5 +84,5 @@
   (load "unwind-protect.lsp")
   (load "values-list.lsp")
   (load "values.lsp")
-  (load "when.lsp"))
-
+  (load "when.lsp")
+)
diff --git a/data-and-control-flow/macrolet.lsp b/data-and-control-flow/macrolet.lsp
index 0fb2189beb748efe8a785adf577fe42a3278be2f..3cb5d19903694833f123e9b65b65f956418a4c18 100644
--- a/data-and-control-flow/macrolet.lsp
+++ b/data-and-control-flow/macrolet.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Oct  9 19:41:24 2002
 ;;;; Contains: Tests of MACROLET
 
-(in-package :cl-test)
+
 
 (deftest macrolet.1
   (let ((z (list 3 4)))
diff --git a/data-and-control-flow/multiple-value-bind.lsp b/data-and-control-flow/multiple-value-bind.lsp
index be31f9fc6193a28ae203e30ae0dd472978f4db35..421a76fe50a56d4224c8ef92ad92650aedff5877 100644
--- a/data-and-control-flow/multiple-value-bind.lsp
+++ b/data-and-control-flow/multiple-value-bind.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Oct 18 23:16:23 2002
 ;;;; Contains: Tests for MULTIPLE-VALUE-BIND
 
-(in-package :cl-test)
+
 
 (deftest multiple-value-bind.1
   (multiple-value-bind (x y z) (values 1 2 3)
diff --git a/data-and-control-flow/multiple-value-call.lsp b/data-and-control-flow/multiple-value-call.lsp
index ab374ceef0826f47bbd1713a9ece7cd3877677a8..22887d97671db5ed0e1810405e269ea539b673b3 100644
--- a/data-and-control-flow/multiple-value-call.lsp
+++ b/data-and-control-flow/multiple-value-call.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Oct 18 23:35:07 2002
 ;;;; Contains: Tests of MULTIPLE-VALUE-CALL, MULTIPLE-VALUE-LIST
 
-(in-package :cl-test)
+
 
 (deftest multiple-value-call.1
   (multiple-value-call #'+ (values 1 2) (values) 3 (values 4 5 6))
diff --git a/data-and-control-flow/multiple-value-list.lsp b/data-and-control-flow/multiple-value-list.lsp
index 340644f89f45a6c03e159455ea6025ba65bfb872..20a6f3af08b317d09988b4557048b092924ce73c 100644
--- a/data-and-control-flow/multiple-value-list.lsp
+++ b/data-and-control-flow/multiple-value-list.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Feb 17 06:38:07 2003
 ;;;; Contains: Tests of MULTIPLE-VALUE-LIST
 
-(in-package :cl-test)
+
 
 (deftest multiple-value-list.1
   (multiple-value-list 'a)
diff --git a/data-and-control-flow/multiple-value-prog1.lsp b/data-and-control-flow/multiple-value-prog1.lsp
index 84df462208f3cf4eb3c47d5674792eae3e572679..716f7574d2418ff9c02614c77487ee4a44c539d8 100644
--- a/data-and-control-flow/multiple-value-prog1.lsp
+++ b/data-and-control-flow/multiple-value-prog1.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Oct 19 06:48:02 2002
 ;;;; Contains: Tests for MULTIPLE-VALUE-PROG1
 
-(in-package :cl-test)
+
 
 (deftest multiple-value-prog1.1
   (multiple-value-prog1 nil)
diff --git a/data-and-control-flow/multiple-value-setq.lsp b/data-and-control-flow/multiple-value-setq.lsp
index 672a226dfd47a1a0db239ebd1b15b98d8d4a9b10..809a1b7fa7db2a2800d6d816957e8767f429ef98 100644
--- a/data-and-control-flow/multiple-value-setq.lsp
+++ b/data-and-control-flow/multiple-value-setq.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Oct 19 07:00:57 2002
 ;;;; Contains: Tests of MULTIPLE-VALUE-SETQ
 
-(in-package :cl-test)
+
 
 (deftest multiple-value-setq.1
   (let ((x 1) (y 2))
diff --git a/data-and-control-flow/nil.lsp b/data-and-control-flow/nil.lsp
index 1c369f88c50e8daa8301fb327d362e8b21921098..393029572a7b7d657be803060c87c833745b9e88 100644
--- a/data-and-control-flow/nil.lsp
+++ b/data-and-control-flow/nil.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Oct 17 06:32:46 2002
 ;;;; Contains: Tests for NIL
 
-(in-package :cl-test)
+
 
 (deftest nil.1
   (check-predicate #'(lambda (x) (not (subtypep (type-of x) nil))))
diff --git a/data-and-control-flow/not-and-null.lsp b/data-and-control-flow/not-and-null.lsp
index 087779fc6f9ccb4d2b500af0b44503e2ec333048..b3bbaf7d67b56ce6758181e00796a74dce15b2d4 100644
--- a/data-and-control-flow/not-and-null.lsp
+++ b/data-and-control-flow/not-and-null.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Oct 17 06:38:33 2002
 ;;;; Contains: Tests of NOT and NULL
 
-(in-package :cl-test)
+
 
 (deftest null.1
   (null nil)
diff --git a/data-and-control-flow/notany.lsp b/data-and-control-flow/notany.lsp
index bc7125f7d5f74f59eff55a99fd372b13cfcd01d5..d650d972db45bcbd1da25a278c343936ef29255c 100644
--- a/data-and-control-flow/notany.lsp
+++ b/data-and-control-flow/notany.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Oct 18 07:14:14 2002
 ;;;; Contains: Tests for NOTANY
 
-(in-package :cl-test)
+
 
 (deftest notany.1
   (not-mv (notany #'identity nil))
diff --git a/data-and-control-flow/notevery.lsp b/data-and-control-flow/notevery.lsp
index 7679aef6ed56d42a72c17c616c873cbbbfb1fea8..50e91927e0d1266c9e15327cae0d0a57276ed3f5 100644
--- a/data-and-control-flow/notevery.lsp
+++ b/data-and-control-flow/notevery.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Oct 18 07:20:12 2002
 ;;;; Contains: Tests for NOTEVERY
 
-(in-package :cl-test)
+
 
 (deftest notevery.1
   (notevery #'identity nil)
diff --git a/data-and-control-flow/nth-value.lsp b/data-and-control-flow/nth-value.lsp
index bfcf99f6093d901d9e3257ac1684b2c9dfd75db6..8c8444e64d83db147353444565a3556f94bb87f8 100644
--- a/data-and-control-flow/nth-value.lsp
+++ b/data-and-control-flow/nth-value.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Oct 19 08:24:14 2002
 ;;;; Contains: Tests of NTH-VALUE
 
-(in-package :cl-test)
+
 
 (deftest nth-value.1
   (nth-value 0 'a)
diff --git a/data-and-control-flow/or.lsp b/data-and-control-flow/or.lsp
index 4142d9dcec4785bd5125b30b653e56b4525779a2..e11956426b9e6dd930436694f49500c7938003ee 100644
--- a/data-and-control-flow/or.lsp
+++ b/data-and-control-flow/or.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Oct 18 07:29:27 2002
 ;;;; Contains: Tests of OR
 
-(in-package :cl-test)
+
 
 (deftest or.1
   (or)
diff --git a/data-and-control-flow/places.lsp b/data-and-control-flow/places.lsp
index c5efd609f6f03fada4fcf0310c9542ba2a1c8b71..a4101dde667498d347ac9a95ac3e274cbfbda36e 100644
--- a/data-and-control-flow/places.lsp
+++ b/data-and-control-flow/places.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Oct  7 19:20:17 2002
 ;;;; Contains: Tests of various kinds of places (section 5.1)
 
-(in-package :cl-test)
+
 
 ;;; Section 5.1.1.1
 
diff --git a/data-and-control-flow/prog.lsp b/data-and-control-flow/prog.lsp
index 400cba80b9242dd21f7407b0e9154e6aec9817c2..e2067261fa1a4b91aa6c955f1e6a7e8a5cec45f4 100644
--- a/data-and-control-flow/prog.lsp
+++ b/data-and-control-flow/prog.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Oct 19 09:21:57 2002
 ;;;; Contains: Tests of PROG
 
-(in-package :cl-test)
+
 
 (deftest prog.1
   (prog ())
diff --git a/data-and-control-flow/prog1.lsp b/data-and-control-flow/prog1.lsp
index 5383f68874fc60afe5e8c5c8ca02f0f61e7ed972..d7c53fd04985b63341c3c60d10757be9705debc8 100644
--- a/data-and-control-flow/prog1.lsp
+++ b/data-and-control-flow/prog1.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Oct 19 09:37:14 2002
 ;;;; Contains: Tests for PROG1
 
-(in-package :cl-test)
+
 
 (deftest prog1.1
   (prog1 'a)
diff --git a/data-and-control-flow/prog2.lsp b/data-and-control-flow/prog2.lsp
index c80086c323983fc955c7690c0a2c3720d3e7aab2..1a5d18ada28781ca6c4ce6c0089094d727a5ff83 100644
--- a/data-and-control-flow/prog2.lsp
+++ b/data-and-control-flow/prog2.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Oct 19 09:40:51 2002
 ;;;; Contains: Tests for PROG2
 
-(in-package :cl-test)
+
 
 (deftest prog2.1
   (prog2 'a 'b)
diff --git a/data-and-control-flow/progn.lsp b/data-and-control-flow/progn.lsp
index 40e6fae8a6fa12b0b7e609a081392add396118ad..04bac3cda1cb00a7ebb7fa5cf90b83c4190f58d8 100644
--- a/data-and-control-flow/progn.lsp
+++ b/data-and-control-flow/progn.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Oct 19 09:33:51 2002
 ;;;; Contains: Tests of PROGN
 
-(in-package :cl-test)
+
 
 (deftest progn.1
   (progn)
diff --git a/data-and-control-flow/progv.lsp b/data-and-control-flow/progv.lsp
index db15c6ef3985e2e7708888fffb81d615494d212b..d0e917a6fbb1389cd53fd3048e90aac0a27724b0 100644
--- a/data-and-control-flow/progv.lsp
+++ b/data-and-control-flow/progv.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Oct 12 10:00:50 2002
 ;;;; Contains: Tests for PROGV
 
-(in-package :cl-test)
+
 
 (deftest progv.1
   (progv () () t)
diff --git a/data-and-control-flow/psetf.lsp b/data-and-control-flow/psetf.lsp
index 140c8677f656f85873cf3fab5687f0f42a49c17b..b3d97be30c4df0acc3de5bdec756f0379d441b39 100644
--- a/data-and-control-flow/psetf.lsp
+++ b/data-and-control-flow/psetf.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 15:38:30 2003
 ;;;; Contains: Tests of PSETF
 
-(in-package :cl-test)
+
 
 (deftest psetf.order.1
   (let ((x (vector nil nil nil nil))
diff --git a/data-and-control-flow/psetq.lsp b/data-and-control-flow/psetq.lsp
index 4d00dde74f4ae7b8381c2ff72009ddd305b1a330..052186de71a65ff7aec97eb63ab5e7f829eddb2e 100644
--- a/data-and-control-flow/psetq.lsp
+++ b/data-and-control-flow/psetq.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 15:37:20 2003
 ;;;; Contains: Tests of PSETQ
 
-(in-package :cl-test)
+
 
 (deftest psetq.1
   (psetq)
diff --git a/data-and-control-flow/return-from.lsp b/data-and-control-flow/return-from.lsp
index 5bf7698b38dbb257e6d84f26ba5a0cc78e97b29f..b775aad4071fbe1998d90864945086e617e6c730 100644
--- a/data-and-control-flow/return-from.lsp
+++ b/data-and-control-flow/return-from.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Feb 24 20:22:23 2004
 ;;;; Contains: Tests of RETURN-FROM
 
-(in-package :cl-test)
+
 
 ;;; RETURN-FROM is tested extensively in other files
 
diff --git a/data-and-control-flow/return.lsp b/data-and-control-flow/return.lsp
index b8bb16546adbacb64af0d2d56a456275cbf87556..69d1d8898762665098be4fe370731728df42f082 100644
--- a/data-and-control-flow/return.lsp
+++ b/data-and-control-flow/return.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 16:00:32 2003
 ;;;; Contains: Tests of RETURN
 
-(in-package :cl-test)
+
 
 ;;; RETURN is tested extensively in other files
 
diff --git a/data-and-control-flow/rotatef.lsp b/data-and-control-flow/rotatef.lsp
index 76af0ddf1bc62c1890b7a03aa478882ca6f7bedc..0b90b0e125f44e167216c0037cf170a90e9fb754 100644
--- a/data-and-control-flow/rotatef.lsp
+++ b/data-and-control-flow/rotatef.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 15:44:38 2003
 ;;;; Contains: Tests for ROTATEF
 
-(in-package :cl-test)
+
 
 (deftest rotatef-order.1
   (let ((x (vector 'a 'b 'c 'd 'e 'f))
diff --git a/data-and-control-flow/shiftf.lsp b/data-and-control-flow/shiftf.lsp
index eb82f448dfbec735e2aa55bc99ae408628108f92..15ca3d98b34f3b8a6751bcc3bf169ea55e21b86e 100644
--- a/data-and-control-flow/shiftf.lsp
+++ b/data-and-control-flow/shiftf.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 15:43:44 2003
 ;;;; Contains: Tests of SHIFTF
 
-(in-package :cl-test)
+
 
 (deftest shiftf-order.1
   (let ((x (vector 'a 'b 'c 'd 'e))
diff --git a/data-and-control-flow/some.lsp b/data-and-control-flow/some.lsp
index e9a6715cf4acbddee4ca3b2d3e9e106460386cdc..acaadc9a0f3722127b3d96630e1468e464287490 100644
--- a/data-and-control-flow/some.lsp
+++ b/data-and-control-flow/some.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Oct 18 07:07:07 2002
 ;;;; Contains: Tests for SOME
 
-(in-package :cl-test)
+
 
 (deftest some.1
   (some #'identity nil)
diff --git a/data-and-control-flow/t.lsp b/data-and-control-flow/t.lsp
index eecb697dba4f9384dbd85269b966a1322871b555..c4759b48c0c64576aa9bcb8c7d59fbcd2157f55b 100644
--- a/data-and-control-flow/t.lsp
+++ b/data-and-control-flow/t.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Oct 17 06:44:45 2002
 ;;;; Contains: Tests of T
 
-(in-package :cl-test)
+
 
 (deftest t.1
   t t)
diff --git a/data-and-control-flow/tagbody.lsp b/data-and-control-flow/tagbody.lsp
index f6561c82ddf1997bdce855d5079f0d7955e89f81..bed1155c771338a603ed77411b5d28fe2e140b7e 100644
--- a/data-and-control-flow/tagbody.lsp
+++ b/data-and-control-flow/tagbody.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Oct 12 13:27:22 2002
 ;;;; Contains: Tests of TAGBODY
 
-(in-package :cl-test)
+
 
 (deftest tagbody.1
   (tagbody)
diff --git a/data-and-control-flow/typecase.lsp b/data-and-control-flow/typecase.lsp
index 925baeaef53e23e9f61201cc7cc5e20cd71db299..0e6c46751c6e9304467715578cc1e770f8b5d764 100644
--- a/data-and-control-flow/typecase.lsp
+++ b/data-and-control-flow/typecase.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Oct 18 22:51:25 2002
 ;;;; Contains: Tests for TYPECASE
 
-(in-package :cl-test)
+
 
 (deftest typecase.1
   (typecase 1 (integer 'a) (t 'b))
diff --git a/data-and-control-flow/unless.lsp b/data-and-control-flow/unless.lsp
index c0ea3e45377b9eaf998309b899551745461ad227..6f157762279120a695d65986520775e327cc58a7 100644
--- a/data-and-control-flow/unless.lsp
+++ b/data-and-control-flow/unless.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Oct 18 19:39:34 2002
 ;;;; Contains: Tests of UNLESS
 
-(in-package :cl-test)
+
 
 (deftest unless.1
   (unless t)
diff --git a/data-and-control-flow/unwind-protect.lsp b/data-and-control-flow/unwind-protect.lsp
index 79abdf4fdde517a521383199515896261477dc0d..1825dc90151490d1fb9a18b0ea8deae38f02d989 100644
--- a/data-and-control-flow/unwind-protect.lsp
+++ b/data-and-control-flow/unwind-protect.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Oct 12 14:41:16 2002
 ;;;; Contains: Tests of UNWIND-PROTECT
 
-(in-package :cl-test)
+
 
 (deftest unwind-protect.1
   (let ((x nil))
diff --git a/data-and-control-flow/values-list.lsp b/data-and-control-flow/values-list.lsp
index b2e7af8e92c5e9a75619d1809ffc0f9b58cf2f18..8917912e50394f5077cc472c20c03edaec14800f 100644
--- a/data-and-control-flow/values-list.lsp
+++ b/data-and-control-flow/values-list.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Jan 13 16:53:39 2003
 ;;;; Contains: Tests for VALUES-LIST
 
-(in-package :cl-test)
+
 
 (deftest values-list.error.1
   (signals-error (values-list) program-error)
diff --git a/data-and-control-flow/values.lsp b/data-and-control-flow/values.lsp
index a18d3a7d278b1d35064cecef71f82ddf3d4eafa5..61cbc9b693ea221cb4a526d3873ad12884c7aa50 100644
--- a/data-and-control-flow/values.lsp
+++ b/data-and-control-flow/values.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Oct 19 08:18:50 2002
 ;;;; Contains: Tests of VALUES
 
-(in-package :cl-test)
+
 
 (deftest values.0
   (values))
diff --git a/data-and-control-flow/when.lsp b/data-and-control-flow/when.lsp
index 1f1092ed2d090ec35c162fed1540ad73e73cfa64..20ef2f47431d22f1c7a0923141fe28c8fd08e298 100644
--- a/data-and-control-flow/when.lsp
+++ b/data-and-control-flow/when.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Oct 18 19:36:57 2002
 ;;;; Contains: Tests of WHEN
 
-(in-package :cl-test)
+
 
 (deftest when.1
   (when t)
diff --git a/environment/apropos-list.lsp b/environment/apropos-list.lsp
index abe2062af0a14cba23017fc000d4c2e2497d0658..8ca5254c05a4046d701ca3f22320ffb1c6bdd5fd 100644
--- a/environment/apropos-list.lsp
+++ b/environment/apropos-list.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Dec 14 06:21:45 2004
 ;;;; Contains: Tests of APROPOS-LIST
 
-(in-package :cl-test)
+
 
 (deftest apropos-list.1
   (let ((pkg "CL-TEST-APROPOS-LIST-PACKAGE"))
diff --git a/environment/apropos.lsp b/environment/apropos.lsp
index 4c6cd4b681831270523e748b720e9873d940fdef..828e35e5e5efcf299f5a2508a34df5aa19357e32 100644
--- a/environment/apropos.lsp
+++ b/environment/apropos.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Dec 12 16:17:47 2004
 ;;;; Contains: Tests for APROPOS
 
-(in-package :cl-test)
+
 
 (deftest apropos.1
   (loop for n from 10
diff --git a/environment/decode-universal-time.lsp b/environment/decode-universal-time.lsp
index 7884f4fa59c068e3957f2c9e50531e7a2873770f..60a198e055f37d7a014117107581babffcf4a888 100644
--- a/environment/decode-universal-time.lsp
+++ b/environment/decode-universal-time.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May  7 07:00:58 2005
 ;;;; Contains: Tests of DECODE-UNIVERSAL-TIME
 
-(in-package :cl-test)
+
 
 (deftest decode-universal-time.1
   (decode-universal-time 0 0)
diff --git a/environment/describe.lsp b/environment/describe.lsp
index 6919d6de9634ce18773a6003115f0a53c7198d00..7ccf6e2897be8b22b734db1a771a22594916159b 100644
--- a/environment/describe.lsp
+++ b/environment/describe.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Dec 12 13:22:13 2004
 ;;;; Contains: Tests of DESCRIBE
 
-(in-package :cl-test)
+
 
 (defun harness-for-describe (fn)
   (let (s1 s2)
diff --git a/environment/disassemble.lsp b/environment/disassemble.lsp
index 99e0511d797ccea0bff582382cf05d10717e1c8d..9724f4cdcb066df3a5940c284d0637bb9652ff48 100644
--- a/environment/disassemble.lsp
+++ b/environment/disassemble.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun May 18 20:47:58 2003
 ;;;; Contains: Tests of DISASSEMBLE
 
-(in-package :cl-test)
+
 
 (defun disassemble-it (fn)
   (let (val)
diff --git a/environment/documentation.lsp b/environment/documentation.lsp
index 5918a6e8e278e0e1ee508e739e38d35311347595..33e2e9f4e29797580c7f1523840782f159e378d1 100644
--- a/environment/documentation.lsp
+++ b/environment/documentation.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Dec 14 07:30:01 2004
 ;;;; Contains: Tests of DOCUMENTATION
 
-(in-package :cl-test)
+
 
 ;;; documentation (x function) (doc-type (eql 't))
 
diff --git a/environment/dribble.lsp b/environment/dribble.lsp
index 487dd458f9c77d1dfb06593c7249ca780ed34f6f..33737d83d6d0b11611837bf38c6699327b4a6e03 100644
--- a/environment/dribble.lsp
+++ b/environment/dribble.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun May 15 12:56:29 2005
 ;;;; Contains: Tests of DRIBBLE
 
-(in-package :cl-test)
+
 
 ;;; Error tests only -- cannot depend on using it in a program
 ;;; See the CLHS DRIBBLE and issue DRIBBLE-TECHNIQUE for an explanation
diff --git a/environment/ed.lsp b/environment/ed.lsp
index 2dd2b8839f25b471ec4316568a9df5f40093c33b..6bad12f41f7c4ccbe8c13a794c64154c066719cb 100644
--- a/environment/ed.lsp
+++ b/environment/ed.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun May 15 13:07:39 2005
 ;;;; Contains: Tests of ED
 
-(in-package :cl-test)
+
 
 ;;; Since the normal behavior of ED is implementation dependent,
 ;;; test only the error behavior
diff --git a/environment/encode-universal-time.lsp b/environment/encode-universal-time.lsp
index f290db12e2a5f1684a3ce58f1886055a0a9531ec..0e66ee4be670718ffdab40f252cd7e5d1e067062 100644
--- a/environment/encode-universal-time.lsp
+++ b/environment/encode-universal-time.lsp
@@ -5,7 +5,7 @@
 
 ;;; See also the tests in decode-universal-time.lsp
 
-(in-package :cl-test)
+
 
 (deftest encode-universal-time.1
   (loop with count = 0
diff --git a/environment/environment-functions.lsp b/environment/environment-functions.lsp
index 4958fab3d20a785ec21f2fd339f5b9755db56de3..0c3f6b61cbd291ea883c724b9813554ca794bd2f 100644
--- a/environment/environment-functions.lsp
+++ b/environment/environment-functions.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Dec 11 22:15:54 2004
 ;;;; Contains: Tests of various string-returning functions from section 25
 
-(in-package :cl-test)
+
 
 (defmacro def-env-tests (fn-name)
   (flet ((%name (suffix) (intern (concatenate 'string (symbol-name fn-name) suffix)
diff --git a/environment/get-internal-time.lsp b/environment/get-internal-time.lsp
index 3eef56cd3e226918d57a6724de801795ef365178..5d6d63d45eae5133c0639228dd2eb67995d4d12e 100644
--- a/environment/get-internal-time.lsp
+++ b/environment/get-internal-time.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun May  8 20:28:21 2005
 ;;;; Contains: Tests of GET-INTERNAL-REAL-TIME, GET-INTERNAL-RUN-TIME
 
-(in-package :cl-test)
+
 
 (deftest get-internal-real-time.1
   (notnot-mv (typep (multiple-value-list (get-internal-real-time)) '(cons unsigned-byte null)))
diff --git a/environment/get-universal-time.lsp b/environment/get-universal-time.lsp
index 76dbccd7c5678b8d4a8293ac827e41b016a58a73..ffa9b4bc042af324ca0cf296c17166810c0a3122 100644
--- a/environment/get-universal-time.lsp
+++ b/environment/get-universal-time.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun May  8 19:25:41 2005
 ;;;; Contains: Tests of GET-UNIVERSAL-TIME, GET-DECODED-TIME
 
-(in-package :cl-test)
+
 
 ;;; Note -- this ignores the possibilty that the time cannot
 ;;; be determined.
diff --git a/environment/inspect.lsp b/environment/inspect.lsp
index c23286ca9944e99be3e1d88468d85c49b89e8c6d..a0ad9cbf810125eec3ec8fee1b78de9716cbc806 100644
--- a/environment/inspect.lsp
+++ b/environment/inspect.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun May 15 12:54:22 2005
 ;;;; Contains: Tests of INSPECT
 
-(in-package :cl-test)
+
 
 ;;; INSPECT's normal behavior is entirely implementation-dependent,
 ;;; so it cannot be tested here.  Only test simple error cases.
diff --git a/environment/load.lsp b/environment/load.lsp
index be3e5b36b3f35b5383357c287445bcaff42c35dc..95d8b2cff870d32e2389dde7ac0bc3a798d5de29 100644
--- a/environment/load.lsp
+++ b/environment/load.lsp
@@ -3,7 +3,11 @@
 ;;;; Created:  Sun Dec 12 19:43:17 2004
 ;;;; Contains: Load environment tests (section 25)
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "apropos.lsp")
   (load "apropos-list.lsp")
   (load "describe.lsp")
diff --git a/environment/room.lsp b/environment/room.lsp
index ef09eb7630a3d214f3cf39cb371c37004d1fb5c5..ac7c43d66d0b816af214afb656d956d8b26078da 100644
--- a/environment/room.lsp
+++ b/environment/room.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Dec 12 09:20:47 2004
 ;;;; Contains: Tests of ROOM
 
-(in-package :cl-test)
+
 
 (deftest room.1
   (let ((s (with-output-to-string
diff --git a/environment/sleep.lsp b/environment/sleep.lsp
index 91e591e6893cc8aec225d21fc1cd0959678a5f87..d8445b2690d3f3d041c85ebaca84677dc66f5134 100644
--- a/environment/sleep.lsp
+++ b/environment/sleep.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun May  8 19:53:39 2005
 ;;;; Contains: Tests of SLEEP
 
-(in-package :cl-test)
+
 
 (deftest sleep.1
   (sleep 0)
diff --git a/environment/time.lsp b/environment/time.lsp
index 9494e6173c0f5f56779c55ffb7825c01ecd040b2..e55ba80ffb4b60ea36f4bb9cedfb3025d74c6769 100644
--- a/environment/time.lsp
+++ b/environment/time.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Dec 12 09:43:47 2004
 ;;;; Contains: Tests of TIME
 
-(in-package :cl-test)
+
 
 (deftest time.1
   (let ((s (with-output-to-string
diff --git a/environment/trace.lsp b/environment/trace.lsp
index a98345860f3f70c58ccbac69fe8ec36886b9b88f..e20d92c4510ffdde907719a55361ac662ce7852b 100644
--- a/environment/trace.lsp
+++ b/environment/trace.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Dec 12 19:53:11 2004
 ;;;; Contains: Tests of TRACE, UNTRACE
 
-(in-package :cl-test)
+
 
 (defun function-to-trace (x) (car x))
 (defun another-function-to-trace (x) (cdr x))
diff --git a/environment/user-homedir-pathname.lsp b/environment/user-homedir-pathname.lsp
index 1200546b93a6dc2a8f479dc5de3a7dd4a8d1ae9c..f8e13da1d0f8953512a4927c1d4e00d9af350d5f 100644
--- a/environment/user-homedir-pathname.lsp
+++ b/environment/user-homedir-pathname.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Dec 11 22:26:24 2004
 ;;;; Contains: Tests of USER-HOMEDIR-PATHNAME
 
-(in-package :cl-test)
+
 
 (deftest user-homedir-pathname.1
   (let ((pn (user-homedir-pathname)))
diff --git a/eval-and-compile/compile.lsp b/eval-and-compile/compile.lsp
index 64dbd6e2267a547ef91c49a82eb0959bff8993dd..9ac60e879008535acaa32ad0bbe7191170c9ac94 100644
--- a/eval-and-compile/compile.lsp
+++ b/eval-and-compile/compile.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Oct 10 20:54:20 2002
 ;;;; Contains: Tests for COMPILE, COMPILED-FUNCTION-P, COMPILED-FUNCTION
 
-(in-package :cl-test)
+
 
 (deftest compile.1
   (progn
diff --git a/eval-and-compile/compiler-macros.lsp b/eval-and-compile/compiler-macros.lsp
index 116b2aa434aaf1a5771ffa02f943805d8005da1f..d3d42671f9e1d9694fd789be86535acdd3ec8577 100644
--- a/eval-and-compile/compiler-macros.lsp
+++ b/eval-and-compile/compiler-macros.lsp
@@ -3,6 +3,6 @@
 ;;;; Created:  Mon Jan 13 18:51:30 2003
 ;;;; Contains: Tests for compiler macros
 
-(in-package :cl-test)
+
 
 ;;; Compiler macro tests will go here
diff --git a/eval-and-compile/constantp.lsp b/eval-and-compile/constantp.lsp
index eb935183d2e562b61c4e7ed04f30e8c4fdf164b1..1e51414d243f545013795dbcd5bdb92e1323f3ea 100644
--- a/eval-and-compile/constantp.lsp
+++ b/eval-and-compile/constantp.lsp
@@ -5,7 +5,7 @@
 
 ;;; See also defconstant.lsp
 
-(in-package :cl-test)
+
 
 ;;; Error tests
 
diff --git a/eval-and-compile/declaim.lsp b/eval-and-compile/declaim.lsp
index f64066316b409286d5017027f6b974719a931200..31612b37f6873052a1a883a47ac0f9c69734df58 100644
--- a/eval-and-compile/declaim.lsp
+++ b/eval-and-compile/declaim.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 21 07:44:07 2005
 ;;;; Contains: Tests of DECLAIM
 
-(in-package :cl-test)
+
 
 (deftest declaim.1
   (progn (declaim) nil)
diff --git a/eval-and-compile/declaration.lsp b/eval-and-compile/declaration.lsp
index 09ca953f7c9823dcf2febfa79d7e7faa6b7269c6..f216e1879452c35e80c58a9e585443d58d4048d4 100644
--- a/eval-and-compile/declaration.lsp
+++ b/eval-and-compile/declaration.lsp
@@ -4,7 +4,7 @@
 ;;;; Contains: Tests of the DECLARATION declarations
 
 
-(in-package :cl-test)
+
 
 (deftest declaration.1
   (progn (declaim (declaration)) nil)
diff --git a/eval-and-compile/define-compiler-macro.lsp b/eval-and-compile/define-compiler-macro.lsp
index a8b290da0a3e120e1104aa45de4f18a3d32f8f0d..fc0440b0b033b091918f16730c2694f3ff7124aa 100644
--- a/eval-and-compile/define-compiler-macro.lsp
+++ b/eval-and-compile/define-compiler-macro.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 12:33:02 2003
 ;;;; Contains: Tests of DEFINE-COMPILER-MACRO
 
-(in-package :cl-test)
+
 
 ;;; Need to add non-error tests
 
diff --git a/eval-and-compile/define-symbol-macro.lsp b/eval-and-compile/define-symbol-macro.lsp
index e3af2f465e3b72be8f314f2c3a552ab8f107600b..d29fdda5a78f07b86d38bf18927d5ce3ae14c6bf 100644
--- a/eval-and-compile/define-symbol-macro.lsp
+++ b/eval-and-compile/define-symbol-macro.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 12:55:05 2003
 ;;;; Contains: Tests of DEFINE-SYMBOL-MACRO
 
-(in-package :cl-test)
+
 
 (deftest define-symbol-macro.error.1
   (signals-error (funcall (macro-function 'define-symbol-macro))
diff --git a/eval-and-compile/defmacro.lsp b/eval-and-compile/defmacro.lsp
index 5510951d30039b7bcc2312deb6a13394d46b1bb9..f1aa869ac3e6723ff56573f0c626250e7647eae9 100644
--- a/eval-and-compile/defmacro.lsp
+++ b/eval-and-compile/defmacro.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 20 12:35:24 2003
 ;;;; Contains: Tests of DEFMACRO
 
-(in-package :cl-test)
+
 
 (deftest defmacro.error.1
   (signals-error (funcall (macro-function 'defmacro))
diff --git a/eval-and-compile/dynamic-extent.lsp b/eval-and-compile/dynamic-extent.lsp
index 9bfc507a691316acc3201bda43bd4fbf934d378a..b91b284e1613683837f597c7314212ecc23f1923 100644
--- a/eval-and-compile/dynamic-extent.lsp
+++ b/eval-and-compile/dynamic-extent.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 21 09:10:52 2005
 ;;;; Contains: Tests of DYNAMIC-EXTENT
 
-(in-package :cl-test)
+
 
 (deftest dynamic-extent.1
   (let () (declare (dynamic-extent)))
diff --git a/eval-and-compile/eval-and-compile.lsp b/eval-and-compile/eval-and-compile.lsp
index 265a54255aae6e85f8c63b9f851caa1e2f013fc1..fc2758b0d37c0200c0b9ee03b2a5fd45efc612a4 100644
--- a/eval-and-compile/eval-and-compile.lsp
+++ b/eval-and-compile/eval-and-compile.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Oct 21 22:52:19 2002
 ;;;; Contains: Overall tests for section 3, 'Evaluation and Compilation'
 
-(in-package :cl-test)
+
 
 (defparameter *eval-and-compile-fns*
   '(compile eval macroexpand macroexpand-1 proclaim special-operator-p
diff --git a/eval-and-compile/eval-when.lsp b/eval-and-compile/eval-when.lsp
index cd347694cc4c153ee131b2b7d94f572802bd263a..2b21b6bec4eb386379f0efd00389be6908a75fa7 100644
--- a/eval-and-compile/eval-when.lsp
+++ b/eval-and-compile/eval-when.lsp
@@ -6,7 +6,7 @@
 ;;; The following test was suggested by Sam Steingold,
 ;;; so I've created this file to hold it.
 
-(in-package :cl-test)
+
 
 (defvar *eval-when.1-collector*)
 
diff --git a/eval-and-compile/eval.lsp b/eval-and-compile/eval.lsp
index 44d36c8be6e531e99395e125a068a7b7282d75b2..8b6b777d20c1d845aaf56a09536ba6f6d90e5835 100644
--- a/eval-and-compile/eval.lsp
+++ b/eval-and-compile/eval.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Nov 21 10:43:15 2002
 ;;;; Contains: Tests of EVAL
 
-(in-package :cl-test)
+
 
 (deftest eval.1
   (eval 1)
diff --git a/eval-and-compile/ignorable.lsp b/eval-and-compile/ignorable.lsp
index f8b5962015dfb9b34c3f8805d6bc969b0da7bf07..f5eacadb0f61335a4e706fbfcf1f1ea37f3eee61 100644
--- a/eval-and-compile/ignorable.lsp
+++ b/eval-and-compile/ignorable.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 21 08:16:27 2005
 ;;;; Contains: Tests of the IGNORABLE declaration
 
-(in-package :cl-test)
+
 
 (deftest ignorable.1
   (let ((x 'foo)) (declare (ignorable x)))
diff --git a/eval-and-compile/ignore.lsp b/eval-and-compile/ignore.lsp
index 066a3283e8ead67ac72186aa9b5789d708e8f03a..228f477ac50b80c183eaa0784d37c31b6ce6e912 100644
--- a/eval-and-compile/ignore.lsp
+++ b/eval-and-compile/ignore.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 21 07:59:24 2005
 ;;;; Contains: Tests of the IGNORE declarations
 
-(in-package :cl-test)
+
 
 (deftest ignore.1
   (let ((x 'foo)) (declare (ignore x)))
diff --git a/eval-and-compile/lambda.lsp b/eval-and-compile/lambda.lsp
index 57d9cfdc51bbfe7310c11cd9e5b560e4a0fabe3e..e4afedab8fd70cb2f0c52c717c1e9808b7cc0e95 100644
--- a/eval-and-compile/lambda.lsp
+++ b/eval-and-compile/lambda.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Nov 27 06:43:21 2002
 ;;;; Contains: Tests of LAMBDA forms
 
-(in-package :cl-test)
+
 
 (deftest lambda.1
   ((lambda (x) x) 'a)
diff --git a/eval-and-compile/load.lsp b/eval-and-compile/load.lsp
index 82f9c3885ca5a77cf3a1ddd49b15b34dda420ef2..7688a7a537f0caca5b80e3c231ef634fc2fb32d4 100644
--- a/eval-and-compile/load.lsp
+++ b/eval-and-compile/load.lsp
@@ -1,28 +1,32 @@
 ;;; Tests of evaluation and compilation
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
-  (load "eval-and-compile/eval.lsp")
-  (load "eval-and-compile/eval-and-compile.lsp")
-  (load "eval-and-compile/compile.lsp")
-  (load "eval-and-compile/compiler-macros.lsp")
-  (load "eval-and-compile/constantp.lsp")
-  (load "eval-and-compile/lambda.lsp")
-  (load "eval-and-compile/eval-when.lsp")
-  (load "eval-and-compile/define-compiler-macro.lsp")
-  (load "eval-and-compile/define-symbol-macro.lsp")
-  (load "eval-and-compile/defmacro.lsp")
-  (load "eval-and-compile/the.lsp")
-  (load "eval-and-compile/symbol-macrolet.lsp")
-  (load "eval-and-compile/proclaim.lsp")
-  (load "eval-and-compile/declaim.lsp")
-  (load "eval-and-compile/locally.lsp")
-  (load "eval-and-compile/ignore.lsp")
-  (load "eval-and-compile/ignorable.lsp")
-  (load "eval-and-compile/dynamic-extent.lsp")
-  (load "eval-and-compile/optimize.lsp")
-  (load "eval-and-compile/special.lsp")
-  (load "eval-and-compile/macroexpand.lsp")
-  (load "eval-and-compile/macroexpand-1.lsp")
-  (load "eval-and-compile/declaration.lsp")
-  (load "eval-and-compile/type.lsp")
-  (load "eval-and-compile/macro-function.lsp"))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
+  (load "eval.lsp")
+  (load "eval-and-compile.lsp")
+  (load "compile.lsp")
+  (load "compiler-macros.lsp")
+  (load "constantp.lsp")
+  (load "lambda.lsp")
+  (load "eval-when.lsp")
+  (load "define-compiler-macro.lsp")
+  (load "define-symbol-macro.lsp")
+  (load "defmacro.lsp")
+  (load "the.lsp")
+  (load "symbol-macrolet.lsp")
+  (load "proclaim.lsp")
+  (load "declaim.lsp")
+  (load "locally.lsp")
+  (load "ignore.lsp")
+  (load "ignorable.lsp")
+  (load "dynamic-extent.lsp")
+  (load "optimize.lsp")
+  (load "special.lsp")
+  (load "macroexpand.lsp")
+  (load "macroexpand-1.lsp")
+  (load "declaration.lsp")
+  (load "type.lsp")
+  (load "macro-function.lsp"))
diff --git a/eval-and-compile/locally.lsp b/eval-and-compile/locally.lsp
index a198d8ba495da054e91edcec046c66508ac3089a..d8658a88c36a0c79c2e6b52cde012c6af055390c 100644
--- a/eval-and-compile/locally.lsp
+++ b/eval-and-compile/locally.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Jan  8 06:02:47 2005
 ;;;; Contains: Tests of LOCALLY
 
-(in-package :cl-test)
+
 
 (deftest locally.1
   (locally)
diff --git a/eval-and-compile/macro-function.lsp b/eval-and-compile/macro-function.lsp
index 2dfcb761db881cd5f156a995377c4ffc75c0bc00..4f057bb51b6f7eb18944d3f81c0a81ed0b40c8b2 100644
--- a/eval-and-compile/macro-function.lsp
+++ b/eval-and-compile/macro-function.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Jun  3 22:17:34 2005
 ;;;; Contains: Tests of MACRO-FUNCTION
 
-(in-package :cl-test)
+
 
 (deftest macro-function.1
   (loop for n in *cl-macro-symbols*
diff --git a/eval-and-compile/macroexpand-1.lsp b/eval-and-compile/macroexpand-1.lsp
index 5b8dcc484041fa2a911269438a90dfd8322a070c..8c261d834590a8f379cc4bafa498d43cf20f431f 100644
--- a/eval-and-compile/macroexpand-1.lsp
+++ b/eval-and-compile/macroexpand-1.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 28 13:47:32 2005
 ;;;; Contains: Tests of MACROEXPAND-1
 
-(in-package :cl-test)
+
 
 (deftest macroexpand-1.error.1
   (signals-error (macroexpand-1) program-error)
diff --git a/eval-and-compile/macroexpand.lsp b/eval-and-compile/macroexpand.lsp
index 3db6b1784e02fee63a857f83b27820711e23d6ad..9b21474770c162596e81a84936ab78fd6e7bce03 100644
--- a/eval-and-compile/macroexpand.lsp
+++ b/eval-and-compile/macroexpand.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 28 13:43:00 2005
 ;;;; Contains: Tests of MACROEXPAND
 
-(in-package :cl-test)
+
 
 (deftest macroexpand.error.1
   (signals-error (macroexpand) program-error)
diff --git a/eval-and-compile/optimize.lsp b/eval-and-compile/optimize.lsp
index 20671444d2e2a286ec9fdc52a0ac49b7a179d325..d6caf1cfaafda256333d4d84eda4bb85fdbb750f 100644
--- a/eval-and-compile/optimize.lsp
+++ b/eval-and-compile/optimize.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 21 09:31:34 2005
 ;;;; Contains: Tests of the OPTIMIZE declaration
 
-(in-package :cl-test)
+
 
 (deftest optimize.1
   (locally (declare (optimize)) nil)
diff --git a/eval-and-compile/proclaim.lsp b/eval-and-compile/proclaim.lsp
index 76f61838b140413ee9ae86e01e230e420cd2608c..803c1a505509f57dd269900a8773b5c42e2c280f 100644
--- a/eval-and-compile/proclaim.lsp
+++ b/eval-and-compile/proclaim.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 21 07:33:53 2005
 ;;;; Contains: Tests of PROCLAIM
 
-(in-package :cl-test)
+
 
 (deftest proclaim.1
   (let ((sym (gensym)))
diff --git a/eval-and-compile/special.lsp b/eval-and-compile/special.lsp
index 699f5290db5e2a69ea1f450f221149bb15e1acdf..dbb85bfe9fa3fbd4097d691fcc4e3804ec10e5cb 100644
--- a/eval-and-compile/special.lsp
+++ b/eval-and-compile/special.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 21 12:51:59 2005
 ;;;; Contains: Tests of the declaration SPECIAL
 
-(in-package :cl-test)
+
 
 ;;; Many tests for this declaration are in the tests
 ;;; for specific binding forms.
diff --git a/eval-and-compile/symbol-macrolet.lsp b/eval-and-compile/symbol-macrolet.lsp
index dc331cbe071b95583433bfa2aeffe199155de468..341d14b8c0f1d4bb2de27ec844c6bc63db37b58c 100644
--- a/eval-and-compile/symbol-macrolet.lsp
+++ b/eval-and-compile/symbol-macrolet.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Jan  8 05:58:53 2005
 ;;;; Contains: Tests of SYMBOL-MACROLET
 
-(in-package :cl-test)
+
 
 (deftest symbol-macrolet.1
   (loop for s in *cl-non-variable-constant-symbols*
diff --git a/eval-and-compile/the.lsp b/eval-and-compile/the.lsp
index ace4c1a77c4f7db8b7108ccf21d0ec09ab9c746c..466637c98838e9838b79d6024b913d1604cc43e8 100644
--- a/eval-and-compile/the.lsp
+++ b/eval-and-compile/the.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue May  6 06:48:48 2003
 ;;;; Contains: Tests of THE
 
-(in-package :cl-test)
+
 
 (deftest the.1
   (the (values) (values)))
diff --git a/eval-and-compile/type.lsp b/eval-and-compile/type.lsp
index 17244f414a7006ea04746ab7aa8b89de2674d823..d4f683ba8c76713b3365fc56885338acbb9cc0c2 100644
--- a/eval-and-compile/type.lsp
+++ b/eval-and-compile/type.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun May 29 08:25:46 2005
 ;;;; Contains: Tests of TYPE declarations
 
-(in-package :cl-test)
+
 
 ;;; Also of implicit type declarations
 
diff --git a/files/delete-file.lsp b/files/delete-file.lsp
index 05d594233ee18a95bdce594dcbe209be1c499b51..7f8a8b3ae2a1e0db1be61f5f533ff745a15d67e3 100644
--- a/files/delete-file.lsp
+++ b/files/delete-file.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jan 13 18:42:29 2004
 ;;;; Contains: Tests for DELETE-FILE
 
-(in-package :cl-test)
+
 
 (deftest delete-file.1
   (let ((pn "scratchfile.txt"))
diff --git a/files/directory.lsp b/files/directory.lsp
index f39701c14ba2a656b7e2cff32f830dd37f7114e1..93ef9ab10336672b315d427ff655719d6411efcb 100644
--- a/files/directory.lsp
+++ b/files/directory.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Jan  1 12:00:18 2004
 ;;;; Contains: Tests of DIRECTORY
 
-(in-package :cl-test)
+
 
 (deftest directory.1
   (directory "nonexistent")
diff --git a/files/ensure-directories-exist.lsp b/files/ensure-directories-exist.lsp
index 5ed7dc78b2808a18aa9c7f80e83b8022a9775a6f..982e7d6668961d1f891350b05982add5f8e1a5bc 100644
--- a/files/ensure-directories-exist.lsp
+++ b/files/ensure-directories-exist.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Jan  5 20:53:03 2004
 ;;;; Contains: Tests of ENSURE-DIRECTORIES-EXIST
 
-(in-package :cl-test)
+
 
 (deftest ensure-directories-exist.1
   (let* ((pn (make-pathname :name "ensure-directories-exist.lsp"
diff --git a/files/file-author.lsp b/files/file-author.lsp
index 2d33a1b90bcd59571471d5deafcdc94040b75e06..20c4fb3ad69508998c5d33af0d8739ac4fcf2975 100644
--- a/files/file-author.lsp
+++ b/files/file-author.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jan  6 05:41:06 2004
 ;;;; Contains: Tests of FILE-AUTHOR
 
-(in-package :cl-test)
+
 
 (deftest file-author.1
   (loop for pn in
diff --git a/files/file-error.lsp b/files/file-error.lsp
index 50a25a267fa03d885df4d3f2ff4534978a907cc3..4bd5f5620e14519ebba6a8f1abdf4ab55919fe8b 100644
--- a/files/file-error.lsp
+++ b/files/file-error.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jan 13 19:10:02 2004
 ;;;; Contains: Tests of the FILE-ERROR condition, and associated accessor function
 
-(in-package :cl-test)
+
 
 (deftest file-error.1
   (let ((pn (make-pathname :name :wild
diff --git a/files/file-write-date.lsp b/files/file-write-date.lsp
index 5c7fa1262bbd3bad306a22d1f978825514e5512a..b3b63d676725c6df1d9bf4d6ce65059da1d30d66 100644
--- a/files/file-write-date.lsp
+++ b/files/file-write-date.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jan  6 06:01:35 2004
 ;;;; Contains: Tests for FILE-WRITE-DATE
 
-(in-package :cl-test)
+
 
 (deftest file-write-date.1
   (let* ((pn "file-write-date.lsp")
diff --git a/files/load.lsp b/files/load.lsp
index 639404f3b57a73e1428282859a3137a632d147b2..e6758a7305ff6f444f5e07663352314934f58620 100644
--- a/files/load.lsp
+++ b/files/load.lsp
@@ -3,9 +3,11 @@
 ;;;; Created:  Thu Jan  1 11:59:35 2004
 ;;;; Contains: Load tests of section 20, 'Files'
 
-(in-package :cl-test)
+(in-package #:cl-test)
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "directory.lsp")
   (load "probe-file.lsp")
   (load "ensure-directories-exist.lsp")
diff --git a/files/load.lsp~ b/files/load.lsp~
index 6dfc437a84d15c483236b1cd01e5fc5f2b97caaf..d7e0eb3baa6abf8c9f6f84e33c462f209a069f36 100644
--- a/files/load.lsp~
+++ b/files/load.lsp~
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Jan  1 11:59:35 2004
 ;;;; Contains: Load tests of section 20, 'Files'
 
-(in-package :cl-test)
+
 
 (let ((*default-pathname-defaults* (pathname *load-pathname*)))
   (load "directory.lsp")
diff --git a/files/probe-file.lsp b/files/probe-file.lsp
index f637d84844c3bb14e34e36b0f617115e395456e0..c4b8d7af1656c586a52c68eb6774fb22f4f00d19 100644
--- a/files/probe-file.lsp
+++ b/files/probe-file.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Jan  5 20:46:29 2004
 ;;;; Contains: Tests of PROBE-FILE
 
-(in-package :cl-test)
+
 
 (deftest probe-file.1
   (probe-file #p"nonexistent")
diff --git a/files/rename-file.lsp b/files/rename-file.lsp
index 59a1f4c360ea588ae81b6d649c4cb8119f3b2718..16a282ecc71b01614a4edb7d23d4b3b3ed6bf36f 100644
--- a/files/rename-file.lsp
+++ b/files/rename-file.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Jan  8 06:22:53 2004
 ;;;; Contains: Tests for RENAME-FILE
 
-(in-package :cl-test)
+
 
 (deftest rename-file.1
   (let ((pn1 #p"file-to-be-renamed.txt")
diff --git a/files/truename.lsp b/files/truename.lsp
index ca123499eb9505b7d9a86be5da4d4e48156cf43f..3602b4dc55950140b28dc7826286b24d3d076472 100644
--- a/files/truename.lsp
+++ b/files/truename.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jan  6 05:32:37 2004
 ;;;; Contains: Tests of TRUENAME
 
-(in-package :cl-test)
+
 
 (deftest truename.1
   (let* ((pn #p"truename.lsp")
diff --git a/gclload2.lsp b/gclload2.lsp
index efe9c071ae46a05d94ca4ce1c4fe4a52fd8989a9..ef47b630ff5174ea51018d77e0d650306e350508 100644
--- a/gclload2.lsp
+++ b/gclload2.lsp
@@ -1,4 +1,5 @@
 ;;; Load test files
+(in-package :cl-test)
 
 ;;; Tests of symbols
 (load "symbols/load.lsp")
@@ -41,7 +42,7 @@
 (load "structures/load.lsp")
 
 ;;; Tests of types and classes
-(load "types-and-class/load.lsp")
+(load "types-and-classes/load.lsp")
 
 ;;; Tests of strings
 (load "strings/load.lsp")
diff --git a/hash-tables/clrhash.lsp b/hash-tables/clrhash.lsp
index 75e778139bf03c9173dff98789c13b9476d80ce9..90142d3c32e7f0eef865a2580c9288ae9ac75898 100644
--- a/hash-tables/clrhash.lsp
+++ b/hash-tables/clrhash.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Nov 28 09:33:40 2003
 ;;;; Contains: Tests of CLRHASH
 
-(in-package :cl-test)
+
 
 (deftest clrhash.1
   (let ((table (make-hash-table)))
diff --git a/hash-tables/gethash.lsp b/hash-tables/gethash.lsp
index beab51dbcef089f0ffa1ba45605c40248677adb0..0a6d262126d7a3c59a2151735534dbc9d4abb9eb 100644
--- a/hash-tables/gethash.lsp
+++ b/hash-tables/gethash.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Nov 28 06:05:21 2003
 ;;;; Contains: Tests of GETHASH
 
-(in-package :cl-test)
+
 
 ;;; Most testing of GETHASH is in test-hash-table-1 in hash-table-aux.lsp
 
diff --git a/hash-tables/hash-table-count.lsp b/hash-tables/hash-table-count.lsp
index 53f12af09a18cd8edf03a50baf9b6b94af318db9..6bc3a9ed6408c6bbe022e599bfeff405a8bf9e84 100644
--- a/hash-tables/hash-table-count.lsp
+++ b/hash-tables/hash-table-count.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Nov 28 05:14:25 2003
 ;;;; Contains: Tests of HASH-TABLE-COUNT
 
-(in-package :cl-test)
+
 
 (deftest hash-table-count.1
   (hash-table-count (make-hash-table))
diff --git a/hash-tables/hash-table-p.lsp b/hash-tables/hash-table-p.lsp
index de3b9492c052ecb1033ca2566bc65e2b3dfefa3e..d63e24313a46ea44d83a70a06eb17ba690a7828b 100644
--- a/hash-tables/hash-table-p.lsp
+++ b/hash-tables/hash-table-p.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Sep 16 21:58:37 2003
 ;;;; Contains: Tests for HASH-TABLE-P
 
-(in-package :cl-test)
+
 
 (deftest hash-table-p.1
   (loop for e in '(nil t 1 10.0 (a b c) #(a b c) #*1011
diff --git a/hash-tables/hash-table-rehash-size.lsp b/hash-tables/hash-table-rehash-size.lsp
index 9c4f22cbbb5ec1a7acb1b53f48edc79363c30b7d..a8c4893ebdc8473b1496b168dc1be8e513b6524e 100644
--- a/hash-tables/hash-table-rehash-size.lsp
+++ b/hash-tables/hash-table-rehash-size.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Nov 28 05:47:24 2003
 ;;;; Contains: Tests for HASH-TABLE-REHASH-SIZE
 
-(in-package :cl-test)
+
 
 (deftest hash-table-rehash-size.1
   (typep* (hash-table-rehash-size (make-hash-table))
diff --git a/hash-tables/hash-table-rehash-threshold.lsp b/hash-tables/hash-table-rehash-threshold.lsp
index 87a09aa9ea0b1f7bd7ac98714da5a051bbf1ec1e..d6efd82ac2dd3299cc7f87d2cbeb081868c44a87 100644
--- a/hash-tables/hash-table-rehash-threshold.lsp
+++ b/hash-tables/hash-table-rehash-threshold.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Nov 28 05:52:52 2003
 ;;;; Contains: Tests of HASH-TABLE-REHASH-THRESHOLD
 
-(in-package :cl-test)
+
 
 (deftest hash-table-rehash-threshold.1
   (typep* (hash-table-rehash-threshold (make-hash-table))
diff --git a/hash-tables/hash-table-size.lsp b/hash-tables/hash-table-size.lsp
index 9ce1a55ae813a581c76af6972c9d086e33fc5e6e..a667b61f4c7e6226ed3d4749e7216bea4e16c9ee 100644
--- a/hash-tables/hash-table-size.lsp
+++ b/hash-tables/hash-table-size.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Nov 28 05:23:45 2003
 ;;;; Contains: Tests for HASH-TABLE-SIZE
 
-(in-package :cl-test)
+
 
 (deftest hash-table-size.error.1
   (signals-error (hash-table-size) program-error)
diff --git a/hash-tables/hash-table-test.lsp b/hash-tables/hash-table-test.lsp
index ab6b082c50766ac276dd0db51af3af8072b5c289..384d8bcc84acbba5c43d77e9416f13a9afe86d7d 100644
--- a/hash-tables/hash-table-test.lsp
+++ b/hash-tables/hash-table-test.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Nov 28 05:56:22 2003
 ;;;; Contains: Tests for HASH-TABLE-TEST
 
-(in-package :cl-test)
+
 
 (deftest hash-table-test.1
   (hash-table-test (make-hash-table))
diff --git a/hash-tables/hash-table.lsp b/hash-tables/hash-table.lsp
index e87cb7366c6dd0820bee67fcd0aa9a117dccf290..4b6ca5509b709f3d2daec7fd45f0f59cb8da4331 100644
--- a/hash-tables/hash-table.lsp
+++ b/hash-tables/hash-table.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 21:30:42 2003
 ;;;; Contains: Tests of HASH-TABLE and related interface
 
-(in-package :cl-test)
+
 
 (deftest hash-table.1
   (notnot-mv (find-class 'hash-table))
diff --git a/hash-tables/load.lsp b/hash-tables/load.lsp
index 2d23d2cd14fb5727ee68e8ee5d8dafefe082359e..b5780d6d975fb5714f35441a76e478efc94a42eb 100644
--- a/hash-tables/load.lsp
+++ b/hash-tables/load.lsp
@@ -1,6 +1,10 @@
 (compile-and-load "ANSI-TESTS:AUX;hash-table-aux.lsp")
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "hash-table.lsp")
   (load "make-hash-table.lsp")
   (load "hash-table-p.lsp")
diff --git a/hash-tables/make-hash-table.lsp b/hash-tables/make-hash-table.lsp
index 8b0e0bc0c1c9d550f91ed5fa1f9bf8a3ed66975f..d50dcc2d4bf35a2c206f543629852d72c76d5adc 100644
--- a/hash-tables/make-hash-table.lsp
+++ b/hash-tables/make-hash-table.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jan 26 21:36:33 2003
 ;;;; Contains: Tests for MAKE-HASH-TABLE
 
-(in-package :cl-test)
+
 
 ;; (eval-when (:load-toplevel :compile-toplevel :execute)
 ;;  (compile-and-load "hash-table-aux.lsp"))
diff --git a/hash-tables/maphash.lsp b/hash-tables/maphash.lsp
index 0666a26fa198e45e2041432143e3445b5e3d4ac6..a6240b662310befe41e857cfda8e89052cf637d5 100644
--- a/hash-tables/maphash.lsp
+++ b/hash-tables/maphash.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Nov 28 09:36:58 2003
 ;;;; Contains: Test of MAPHASH
 
-(in-package :cl-test)
+
 
 (deftest maphash.1
   (let ((table (make-hash-table)))
diff --git a/hash-tables/remhash.lsp b/hash-tables/remhash.lsp
index 24492ea7e678cb7b4f9eb518a8e34c6ac049f463..39c6d2b99aca98cba5140d508ed5588d533d3fe2 100644
--- a/hash-tables/remhash.lsp
+++ b/hash-tables/remhash.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Nov 28 08:58:06 2003
 ;;;; Contains: Tests of REMHASH
 
-(in-package :cl-test)
+
 
 (deftest remhash.1
   (let ((table (make-hash-table)))
diff --git a/hash-tables/sxhash.lsp b/hash-tables/sxhash.lsp
index 166ba7242c160a448d901c9e28c267ce1c0146b7..b04aec1b474671356c837d580e9744aff9091666 100644
--- a/hash-tables/sxhash.lsp
+++ b/hash-tables/sxhash.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Nov 28 21:18:12 2003
 ;;;; Contains: Tests of SXHASH
 
-(in-package :cl-test)
+
 
 (deftest sxhash.1
   (check-predicate #'(lambda (x) (typep (sxhash x) '(and unsigned-byte fixnum))))
diff --git a/hash-tables/with-hash-table-iterator.lsp b/hash-tables/with-hash-table-iterator.lsp
index 3787d9028cc0cad4d8d14c54023c84e03a481d56..f2f4b49211174a9c9f30084501d03c2310f92438 100644
--- a/hash-tables/with-hash-table-iterator.lsp
+++ b/hash-tables/with-hash-table-iterator.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Nov 28 20:08:43 2003
 ;;;; Contains: Tests of WITH-HASH-TABLE-ITERATOR
 
-(in-package :cl-test)
+
 
 (deftest with-hash-table-iterator.1
   (with-hash-table-iterator (x (make-hash-table)))
diff --git a/iteration/do.lsp b/iteration/do.lsp
index 545516412736f4ece748ae33fdc7d618806d8af8..eabf5c6d7fef4171f20e5dc55d3c155274add90a 100644
--- a/iteration/do.lsp
+++ b/iteration/do.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Jan  8 07:25:18 2005
 ;;;; Contains: Tests of DO
 
-(in-package :cl-test)
+
 
 
 (deftest do.1
diff --git a/iteration/dolist.lsp b/iteration/dolist.lsp
index 9d1528623dc7e1c3b8874c6d9ae11e5faa089693..733d2a4ba571618dd27ebcb6040bad6d9cf3972b 100644
--- a/iteration/dolist.lsp
+++ b/iteration/dolist.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Jan  8 07:26:48 2005
 ;;;; Contains: Tests of DOLIST
 
-(in-package :cl-test)
+
 
 (deftest dolist.1
   (let ((count 0))
diff --git a/iteration/dostar.lsp b/iteration/dostar.lsp
index 883cf56add3b096ae21d835755afe16106417626..9681ba856ed329907647a79c1b2c4433e35b05ff 100644
--- a/iteration/dostar.lsp
+++ b/iteration/dostar.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Jan  8 07:26:22 2005
 ;;;; Contains: Tests of DO*
 
-(in-package :cl-test)
+
 
 
 (deftest do*.1
diff --git a/iteration/dotimes.lsp b/iteration/dotimes.lsp
index 8d606a5a6f6662d716581fda54608ba40a2e22ee..d689083039868a5e95a3c626be82f92139411647 100644
--- a/iteration/dotimes.lsp
+++ b/iteration/dotimes.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Jan  8 07:27:15 2005
 ;;;; Contains: Tests of DOTIMES
 
-(in-package :cl-test)
+
 
 
 (deftest dotimes.1
diff --git a/iteration/load.lsp b/iteration/load.lsp
index c9b840ad5ef4e238cd3084d7b4f21ee76946c74f..fa303c16256aef1029649ad2fc447b944ccd4003 100644
--- a/iteration/load.lsp
+++ b/iteration/load.lsp
@@ -1,6 +1,10 @@
 ;;; Tests of iteration forms
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "do.lsp")
   (load "dostar.lsp")
   (load "dolist.lsp")
diff --git a/iteration/loop.lsp b/iteration/loop.lsp
index a2df304ba491afecca9e163d3f95d3a171c3262d..0f604a62b6c8e9ca667f035fd1013b087cc649fe 100644
--- a/iteration/loop.lsp
+++ b/iteration/loop.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Oct 25 18:48:59 2002
 ;;;; Contains: Tests of LOOP
 
-(in-package :cl-test)
+
 
 ;;; Simple loops
 (deftest sloop.1
diff --git a/iteration/loop1.lsp b/iteration/loop1.lsp
index 2f30a4264c8a71231935e2ebae333711467ee0f6..26457fe308b0da62c4e873949bfa20dd3d40ae12 100644
--- a/iteration/loop1.lsp
+++ b/iteration/loop1.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Oct 25 19:07:19 2002
 ;;;; Contains: Tests of extended loop, part 1
 
-(in-package :cl-test)
+
 
 ;;; Tests of variable initialization and stepping clauses
 
diff --git a/iteration/loop10.lsp b/iteration/loop10.lsp
index 8052c5f3effa526ce72ccd5df3d87c0820fcad59..06dc3699a9b23b3b7e6bd3cf3058872896293e12 100644
--- a/iteration/loop10.lsp
+++ b/iteration/loop10.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Nov 16 09:07:02 2002
 ;;;; Contains: Tests of LOOP numeric value accumulation clauses
 
-(in-package :cl-test)
+
 
 ;; Tests of COUNT, COUNTING
 
diff --git a/iteration/loop11.lsp b/iteration/loop11.lsp
index 658f44c4a5fcc51aae79846911e35df5e071026e..f1b486f24ac9908b3553f8a5f3ac632899a8ad87 100644
--- a/iteration/loop11.lsp
+++ b/iteration/loop11.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Nov 16 21:39:33 2002
 ;;;; Contains: Tests for loop termination clauses REPEAT, WHILE and UNTIL
 
-(in-package :cl-test)
+
 
 ;;; Tests of REPEAT
 
diff --git a/iteration/loop12.lsp b/iteration/loop12.lsp
index 374cacb52eedbbb62b9e9bfadf00a3775346f63f..c07d8cd999ce0815d5b6122ee8f416c0fa8e5ced 100644
--- a/iteration/loop12.lsp
+++ b/iteration/loop12.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Nov 17 08:47:43 2002
 ;;;; Contains: Tests for ALWAYS, NEVER, THEREIS
 
-(in-package :cl-test)
+
 
 ;;; Tests of ALWAYS clauses
 
diff --git a/iteration/loop13.lsp b/iteration/loop13.lsp
index fe66445734a247d1d0c2313581b52dd5fe8ae4c1..e8fa7fcf10199315386203f7f28782386ab2836b 100644
--- a/iteration/loop13.lsp
+++ b/iteration/loop13.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Nov 17 12:37:45 2002
 ;;;; Contains: Tests of DO, DOING, RETURN in LOOP.  Tests of NAMED loops
 
-(in-package :cl-test)
+
 
 (deftest loop.13.1
   (loop do (return 10))
diff --git a/iteration/loop14.lsp b/iteration/loop14.lsp
index 46d61bb109f93475022b66b63797ad8dd9f2125c..25c80d79051eb8aec161c9cc24bb0620bb6bbe89 100644
--- a/iteration/loop14.lsp
+++ b/iteration/loop14.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Nov 20 06:33:21 2002
 ;;;; Contains: Tests of LOOP conditional execution clauses
 
-(in-package :cl-test)
+
 
 (deftest loop.14.1
   (loop for x from 1 to 6
diff --git a/iteration/loop15.lsp b/iteration/loop15.lsp
index 8e23db5714491cd42e9b7e87711c78eb8f18e581..96b5f891243013e24bdeea8569497cfe854e133f 100644
--- a/iteration/loop15.lsp
+++ b/iteration/loop15.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Nov 21 07:08:21 2002
 ;;;; Contains: Tests that keywords can be loop keywords
 
-(in-package :cl-test)
+
 
 ;;; Tests of loop keywords
 
diff --git a/iteration/loop16.lsp b/iteration/loop16.lsp
index ba8d1ff973959933562a0280bce844b7c1980176..bad8eedc057d72d99b76a098a682ad6e159a1c55 100644
--- a/iteration/loop16.lsp
+++ b/iteration/loop16.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Nov 21 09:46:27 2002
 ;;;; Contains: Tests that uninterned symbols can be loop keywords
 
-(in-package :cl-test)
+
 
 
 (deftest loop.16.30
diff --git a/iteration/loop17.lsp b/iteration/loop17.lsp
index 68ce53ed5417461c236ba60e1f2be76aafdcbf7f..782fe04330de7e2ab69fa2b3cc07cfa6972e03b1 100644
--- a/iteration/loop17.lsp
+++ b/iteration/loop17.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Nov 21 09:48:38 2002
 ;;;; Contains: Miscellaneous loop tests
 
-(in-package :cl-test)
+
 
 ;;; Initially and finally take multiple forms,
 ;;; and execute them in the right order
diff --git a/iteration/loop2.lsp b/iteration/loop2.lsp
index cb7d102d20034adea91c651d8e665f4aa518377c..795e771b86b491dacb40e0db847917b4daab3a53 100644
--- a/iteration/loop2.lsp
+++ b/iteration/loop2.lsp
@@ -4,7 +4,7 @@
 ;;;; Contains: Tests of the FOR-AS-IN-LIST loop iteration control form,
 ;;;;      and of destructuring in loop forms
 
-(in-package :cl-test)
+
 
 (deftest loop.2.1
   (loop for x in '(1 2 3) sum x)
diff --git a/iteration/loop3.lsp b/iteration/loop3.lsp
index d2dcba2c8c13ab14520729b92e50d11e67fbc463..f442dd70ab49619cae187d90be557afba9aafedc 100644
--- a/iteration/loop3.lsp
+++ b/iteration/loop3.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Oct 27 08:36:36 2002
 ;;;; Contains: Tests of FOR-ON-AS-LIST iteration control in LOOP
 
-(in-package :cl-test)
+
 
 (deftest loop.3.1
   (loop for x on '(1 2 3) sum (car x))
diff --git a/iteration/loop4.lsp b/iteration/loop4.lsp
index 8e656b7a0ca8c86b6f45efb653c05719e51f9556..06ce79b14702f46d0e7c5e42ea0f6a489781dce1 100644
--- a/iteration/loop4.lsp
+++ b/iteration/loop4.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Oct 27 22:46:39 2002
 ;;;; Contains: Tests for LOOP FOR-AS-EQUAL-THEN
 
-(in-package :cl-test)
+
 
 (deftest loop.4.1
   (loop
diff --git a/iteration/loop5.lsp b/iteration/loop5.lsp
index 004a94fad07379046525b02ee5cce37a76774d50..60c2ee7d90bdea8bb0ca944b612112d4bea04eb1 100644
--- a/iteration/loop5.lsp
+++ b/iteration/loop5.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Nov  2 13:52:50 2002
 ;;;; Contains: Tests of LOOP clause FOR-AS-ACROSS
 
-(in-package :cl-test)
+
 
 (deftest loop.5.1
   (let ((x "abcd")) (loop for e across x collect e))
diff --git a/iteration/loop6.lsp b/iteration/loop6.lsp
index 422e102b53b8200df5fcca5059c3bfe14fc6a685..fc144890d6932b8eceef39ab888d80ca86027d96 100644
--- a/iteration/loop6.lsp
+++ b/iteration/loop6.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Nov 10 21:13:04 2002
 ;;;; Contains: Tests for LOOP-AS-HASH forms
 
-(in-package :cl-test)
+
 
 (defparameter *loop.6.alist*
   '((a . 1) (b . 2) (c . 3)))
diff --git a/iteration/loop7.lsp b/iteration/loop7.lsp
index 0535f4363a2a95260d33920e5606bc60968a9df2..2c0f21823b98a474b6285fd2f01be1f866cd4398 100644
--- a/iteration/loop7.lsp
+++ b/iteration/loop7.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Nov 11 21:40:05 2002
 ;;;; Contains: Tests for FOR-AS-PACKAGE clause for LOOP
 
-(in-package :cl-test)
+
 
 (defpackage "LOOP.CL-TEST.1"
   (:use)
diff --git a/iteration/loop8.lsp b/iteration/loop8.lsp
index 697392b7054b0f0032e54c9f5f03dacdb1eb92fa..eb87de1736beae4ec1a03772129617e36507ebf3 100644
--- a/iteration/loop8.lsp
+++ b/iteration/loop8.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Nov 12 06:30:14 2002
 ;;;; Contains: Tests of LOOP local variable initialization
 
-(in-package :cl-test)
+
 
 (deftest loop.8.1
   (loop with x = 1 do (return x))
diff --git a/iteration/loop9.lsp b/iteration/loop9.lsp
index 6cf77159ddf7c424e158e8f6e713f0db7cd50efc..5da18d4cdb1b46cb8763d1ef215c61763ea01e26 100644
--- a/iteration/loop9.lsp
+++ b/iteration/loop9.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Nov 14 06:25:21 2002
 ;;;; Contains: Tests for loop list accumulation clauses
 
-(in-package :cl-test)
+
 
 ;;; Tests of COLLECT, COLLECTING
 
diff --git a/misc/load.lsp b/misc/load.lsp
index 6f62edfd435c89fac0e4d9dfe7f8b7d6d757874b..cea9999547a53ab9f41cb9fb2dc8ef3ab307a708 100644
--- a/misc/load.lsp
+++ b/misc/load.lsp
@@ -5,7 +5,11 @@
 
 ;;; Miscellaneous tests, mostly tests that failed in random testing
 ;;; on various implementations
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "misc.lsp")
 
 ;;; Misc. tests dealing with type propagation in CMUCL
diff --git a/misc/misc-cmucl-type-prop.lsp b/misc/misc-cmucl-type-prop.lsp
index a5fbb1d9bc6090d3381c52912559e4b9a24e0799..8b556efc6acc1f54def083bb96a205f59cadbd4e 100644
--- a/misc/misc-cmucl-type-prop.lsp
+++ b/misc/misc-cmucl-type-prop.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Mar  4 06:21:51 2005
 ;;;; Contains: CMUCL type prop failures (moved from misc.lsp)
 
-(in-package :cl-test)
+
 
 ;;; All these are 'strange template failures'
 ;;; The comment before each is the NAME of the template in the backtrace
diff --git a/misc/misc.lsp b/misc/misc.lsp
index d80d48ee5e45fab3e4fc3d728af9315bdf1d017d..ed1a5f59045eb3874c6145716d4a10e96d5d756c 100644
--- a/misc/misc.lsp
+++ b/misc/misc.lsp
@@ -8,7 +8,7 @@
 ;;; bug-stimulators in various implementations.
 ;;;
 
-(in-package :cl-test)
+
 
 (declaim (special *s1* *s2* *s3* *s4* *s5* *s6* *s7* *s8*))
 
diff --git a/numbers/abs.lsp b/numbers/abs.lsp
index f584efd9e57380db53d539c047243d901dbbe2b8..4e2b0fb8174f120505b2527ff03e7fc917fe48c7 100644
--- a/numbers/abs.lsp
+++ b/numbers/abs.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Sep  1 20:16:42 2003
 ;;;; Contains: Tests of ABS
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/acos.lsp b/numbers/acos.lsp
index 9944682597a83b94a00be39122be64e150b5d759..bcbf8962d540a370b0ccbb7f3a3b6768de1a8b75 100644
--- a/numbers/acos.lsp
+++ b/numbers/acos.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Feb 10 05:39:24 2004
 ;;;; Contains: Tess of ACOS
 
-(in-package :cl-test)
+
 
 (deftest acos.1
   (loop for i from -1000 to 1000
diff --git a/numbers/acosh.lsp b/numbers/acosh.lsp
index 1425e723ec0e0f65f53d453e036c9b02ec1bbb2e..7d216155fab8dc73d792366a231ad5d55344fe0d 100644
--- a/numbers/acosh.lsp
+++ b/numbers/acosh.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Feb 11 19:20:53 2004
 ;;;; Contains: Tests of ACOSH
 
-(in-package :cl-test)
+
 
 (deftest acosh.1
   (let ((result (acosh 1)))
diff --git a/numbers/arithmetic-error.lsp b/numbers/arithmetic-error.lsp
index 12979cef31a8208f9cd5800165a0c334e8c68cc6..b9d0134c67cc40f857bc79dbb68a2d72aca251b9 100644
--- a/numbers/arithmetic-error.lsp
+++ b/numbers/arithmetic-error.lsp
@@ -2,7 +2,7 @@
 ;;;; Author:   Paul Dietz
 ;;;; Contains: Tests of ARITHMETIC-ERROR condition and associated accessors
 
-(in-package :cl-test)
+
 
 (deftest arithmethic-error.1
   (let ((a (make-condition 'arithmetic-error
diff --git a/numbers/ash.lsp b/numbers/ash.lsp
index 9ee802f8a2357986dd416585506915bf0ec51d88..92e3fe0cc979b2a6639bd4d34e9310ffde6c5f5c 100644
--- a/numbers/ash.lsp
+++ b/numbers/ash.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Sep  7 08:43:03 2003
 ;;;; Contains: Tests of ASH
 
-(in-package :cl-test)
+
 
 ;;; Error tests
 
diff --git a/numbers/asin.lsp b/numbers/asin.lsp
index 2b544ba19108b07593173e9a2107ba270558c4b4..01a02555cebcefb5169ffae54c60dc9c688e7a41 100644
--- a/numbers/asin.lsp
+++ b/numbers/asin.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Feb 11 05:59:43 2004
 ;;;; Contains: Tests for ASIN
 
-(in-package :cl-test)
+
 
 (deftest asin.1
   (loop for i from -1000 to 1000
diff --git a/numbers/asinh.lsp b/numbers/asinh.lsp
index 59fce0025dc62e738251e3c10f2f685883852a0e..5759203bc6159d3d77459e7843e79edbedcbc119 100644
--- a/numbers/asinh.lsp
+++ b/numbers/asinh.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Feb 11 19:19:02 2004
 ;;;; Contains: Tests of ASINH
 
-(in-package :cl-test)
+
 
 (deftest asinh.1
   (let ((result (asinh 0)))
diff --git a/numbers/atan.lsp b/numbers/atan.lsp
index 66cb1eea45a4cd3c8b682b57b1a2aa480fcefa08..09e24b360cf161a2e0e4493f610b0a198f2319d5 100644
--- a/numbers/atan.lsp
+++ b/numbers/atan.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Feb 11 06:01:55 2004
 ;;;; Contains: Tests of ATAN
 
-(in-package :cl-test)
+
 
 (deftest atan.1
   (let ((result (atan 0)))
diff --git a/numbers/atanh.lsp b/numbers/atanh.lsp
index 624c31b2ba29fea91603870eaeb2812d88e78c1a..bd61e458cef42afd9cff218a50d5964d5dd63115 100644
--- a/numbers/atanh.lsp
+++ b/numbers/atanh.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Feb 11 19:26:25 2004
 ;;;; Contains: Tests of ATANH
 
-(in-package :cl-test)
+
 
 (deftest atanh.1
   (let ((result (atanh 0)))
diff --git a/numbers/boole.lsp b/numbers/boole.lsp
index 4cfadafb92d0910efecc0f1e265f9f2e6922b578..8c673317a1a30b3f3961e26f5cc95cf73afe8b43 100644
--- a/numbers/boole.lsp
+++ b/numbers/boole.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Sep  8 20:21:19 2003
 ;;;; Contains: Tests of BOOLE and associated constants
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/byte.lsp b/numbers/byte.lsp
index f9afd20d5874b9ac2bc054d7ff7df1fba281daf8..58815284a7f7458d39ce2d436e9f7d7ca9fec59c 100644
--- a/numbers/byte.lsp
+++ b/numbers/byte.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Sep 11 20:13:22 2003
 ;;;; Contains: Tests of BYTE, BYTE-SIZE, and BYTE-POSITION
 
-(in-package :cl-test)
+
 
 (deftest byte.error.1
   (signals-error (byte) program-error)
diff --git a/numbers/ceiling.lsp b/numbers/ceiling.lsp
index f83be0aca5e58b9442ac023a800e1f3fc3aa78a9..e13c6f71b6b7d0f00522a535e7505ba8265d303a 100644
--- a/numbers/ceiling.lsp
+++ b/numbers/ceiling.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Aug 19 06:50:44 2003
 ;;;; Contains: Tests of CEILING
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/cis.lsp b/numbers/cis.lsp
index 9ff8d22836aa1cac1d67d5a3bccfbefc95ca2b1d..0ddcbc557b325a65a346788755cafabd3a31d0d0 100644
--- a/numbers/cis.lsp
+++ b/numbers/cis.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Sep  6 18:42:15 2003
 ;;;; Contains: Tests of CIS
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/complex.lsp b/numbers/complex.lsp
index 28eb6c25bfc195965297b36710bca5f31f3802ce..277e02a84d0fc83f2d3940d30fa17f62526ae7a3 100644
--- a/numbers/complex.lsp
+++ b/numbers/complex.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Sep  6 19:56:29 2003
 ;;;; Contains: Tests of COMPLEX
 
-(in-package :cl-test)
+
 
 ;;; Error tests
 
diff --git a/numbers/complexp.lsp b/numbers/complexp.lsp
index 3bcd96184456d3a5abf895077c36408ec806a011..0bea7c4a82b19dc73290a717b2ea6cb55f975595 100644
--- a/numbers/complexp.lsp
+++ b/numbers/complexp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Sep  6 21:03:18 2003
 ;;;; Contains: Tests for COMPLEXP
 
-(in-package :cl-test)
+
 
 (deftest complexp.error.1
   (signals-error (complexp) program-error)
diff --git a/numbers/conjugate.lsp b/numbers/conjugate.lsp
index cbcb48fc870a6a174f634b77f635519683d74e9b..f63dad0a8c1e0842a8587d77f7e51846b7954eb5 100644
--- a/numbers/conjugate.lsp
+++ b/numbers/conjugate.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Sep  6 21:07:36 2003
 ;;;; Contains: Tests of CONJUGATE
 
-(in-package :cl-test)
+
 
 ;;; Error tests
 
diff --git a/numbers/cos.lsp b/numbers/cos.lsp
index 6d86e499338c88180a7c99c4575e1d756bb4283f..823f1cc43f5af4c197e8727b0910e65cb6804c1b 100644
--- a/numbers/cos.lsp
+++ b/numbers/cos.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Feb  9 20:53:42 2004
 ;;;; Contains: Tests of COS
 
-(in-package :cl-test)
+
 
 (deftest cos.1
   (loop for i from -1000 to 1000
diff --git a/numbers/cosh.lsp b/numbers/cosh.lsp
index 60d6b7a4bb8e10a99734e14551a7587a79b0a231..515dba437f5da5c9351a0937498f07ced512b732 100644
--- a/numbers/cosh.lsp
+++ b/numbers/cosh.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Feb 11 06:54:15 2004
 ;;;; Contains: Tests of COSH
 
-(in-package :cl-test)
+
 
 (deftest cosh.1
   (let ((result (cosh 0)))
diff --git a/numbers/decf.lsp b/numbers/decf.lsp
index 32e53c3f9b66b52cce9571ca80ddd33cb14d60d3..27523a8ff664175ab95432ba68c7e6d081fb3187 100644
--- a/numbers/decf.lsp
+++ b/numbers/decf.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Sep  4 20:50:54 2003
 ;;;; Contains: Tests of DECF
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/deposit-field.lsp b/numbers/deposit-field.lsp
index b478f0562606e2098928a00f845c5fa0e5dfc8cc..7335f0055184dd5be769b15529a44f4819cfd9da 100644
--- a/numbers/deposit-field.lsp
+++ b/numbers/deposit-field.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Sep 11 20:23:15 2003
 ;;;; Contains: Tests of DEPOSIT-FIELD
 
-(in-package :cl-test)
+
 
 ;;; Error tests
 
diff --git a/numbers/divide.lsp b/numbers/divide.lsp
index 4042004aa1acb6f4c9f53fad5d55b1a3669903b6..005855389be8a25cba9460238fe1d6a1b651e8b6 100644
--- a/numbers/divide.lsp
+++ b/numbers/divide.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Aug 31 20:20:15 2003
 ;;;; Contains: Tests of the / function
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/dpb.lsp b/numbers/dpb.lsp
index 432af38045d2f3b46b5448fa45f571290b470f06..de5680291686fb23ce7b0e0564169db3e70ec1a1 100644
--- a/numbers/dpb.lsp
+++ b/numbers/dpb.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Sep 11 20:43:54 2003
 ;;;; Contains: Tests of DPB
 
-(in-package :cl-test)
+
 
 ;;; Error tests
 
diff --git a/numbers/epsilons.lsp b/numbers/epsilons.lsp
index 24cc2ccd0af5b15b107173e61663c218a12fdf8d..9f4a7665477add3e47a4ccaf615f39866d596dd6 100644
--- a/numbers/epsilons.lsp
+++ b/numbers/epsilons.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Aug 20 22:05:20 2003
 ;;;; Contains: Tests of the EPSILON constants
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/evenp.lsp b/numbers/evenp.lsp
index aeeba3586fb5cdef36829eb41d32841d4111ab22..62e835e709b0a872934123f5aa2c094df7f78aef 100644
--- a/numbers/evenp.lsp
+++ b/numbers/evenp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Aug 31 10:39:01 2003
 ;;;; Contains: Tests of EVENP
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/exp.lsp b/numbers/exp.lsp
index ac7c669270412dee1f08181aebf89ec5fe3e5a8f..83ed9566621af6de2b189da0c94be6d258d518bc 100644
--- a/numbers/exp.lsp
+++ b/numbers/exp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Sep  1 21:24:44 2003
 ;;;; Contains: Tests of EXP
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/expt.lsp b/numbers/expt.lsp
index e85b4ad94f1aa491fce035b40bf3b51415c04503..50ddde82ae6aeeee022ad85ea464ee9cc2d9bc48 100644
--- a/numbers/expt.lsp
+++ b/numbers/expt.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Sep  2 19:36:22 2003
 ;;;; Contains: Tests of EXPT
 
-(in-package :cl-test)
+
 
 ;;; Error tests
 
diff --git a/numbers/fceiling.lsp b/numbers/fceiling.lsp
index b4dd6295e915452d56b13bcd5c586baafcd2f449..1a7303f5e54e5381bdba49ca0a39e4f6e6e40827 100644
--- a/numbers/fceiling.lsp
+++ b/numbers/fceiling.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Aug 20 06:22:23 2003
 ;;;; Contains: Tests of FCEILING
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/ffloor.lsp b/numbers/ffloor.lsp
index 4b2596e863e85163e1d65e82528659e1ab40f070..c07cfacfe14f01cf6a257c09b7a63b6d20b8408c 100644
--- a/numbers/ffloor.lsp
+++ b/numbers/ffloor.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Aug 12 06:59:54 2003
 ;;;; Contains: Tests of FFLOOR
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/float.lsp b/numbers/float.lsp
index a92daf811175454cbd246efdecd4d114c918dc56..58108dd5ed4d254770bbc0fc83528345698f3692 100644
--- a/numbers/float.lsp
+++ b/numbers/float.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Sep 11 21:53:51 2003
 ;;;; Contains: Tests of FLOAT
 
-(in-package :cl-test)
+
 
 (deftest float.error.1
   (signals-error (float) program-error)
diff --git a/numbers/floatp.lsp b/numbers/floatp.lsp
index a52440142fe8d0f28817fb8d7c72ce01415951d3..04176430a1d9903fbdc05da0c54bf9727f7a87ff 100644
--- a/numbers/floatp.lsp
+++ b/numbers/floatp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Sep 11 23:07:33 2003
 ;;;; Contains: Tests of FLOATP
 
-(in-package :cl-test)
+
 
 ;;; Error tests
 
diff --git a/numbers/floor.lsp b/numbers/floor.lsp
index 2e9a0fd6f9dbc875ac41995b279446810b4e4dab..145c82abd9808f2a8e14ff2203d68a6999e54dec 100644
--- a/numbers/floor.lsp
+++ b/numbers/floor.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Aug  4 22:16:00 2003
 ;;;; Contains: Tests of FLOOR
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/fround.lsp b/numbers/fround.lsp
index b22548bc9360116c18655d1746178103f3289258..a2d84f294eddb5e6d62578646955f9c4147d86ad 100644
--- a/numbers/fround.lsp
+++ b/numbers/fround.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Aug 21 16:07:59 2003
 ;;;; Contains: Tests of FROUND
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/ftruncate.lsp b/numbers/ftruncate.lsp
index c4bee25129981b9a34f955c96e16cb9ad6b1887a..5272df80ce0d24338c11afa05ffb4e86302c11be 100644
--- a/numbers/ftruncate.lsp
+++ b/numbers/ftruncate.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Aug 20 06:36:35 2003
 ;;;; Contains: Tests of FTRUNCATE
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/gcd.lsp b/numbers/gcd.lsp
index d89d9951b728073d82770e61c954eb56763dba9a..846a33e4b9cd0743835fa0efe983b0f018001b67 100644
--- a/numbers/gcd.lsp
+++ b/numbers/gcd.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Sep  3 06:51:03 2003
 ;;;; Contains: Tests of GCD
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/imagpart.lsp b/numbers/imagpart.lsp
index 823c7236e3cfc988881aeb76985fafc54f4f172e..0f6aa2c68ce5cc9a2a96bce74aa8dc311a10627b 100644
--- a/numbers/imagpart.lsp
+++ b/numbers/imagpart.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Sep  7 07:47:43 2003
 ;;;; Contains: Tests of IMAGPART
 
-(in-package :cl-test)
+
 
 (deftest imagpart.error.1
   (signals-error (imagpart) program-error)
diff --git a/numbers/incf.lsp b/numbers/incf.lsp
index b4f64a918e61c0b920123bf679a71936b111edd8..28bc30570ab61e4aacf7f582f2a82d04b815fa81 100644
--- a/numbers/incf.lsp
+++ b/numbers/incf.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Sep  4 20:01:15 2003
 ;;;; Contains: Tests of INCF
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/integer-length.lsp b/numbers/integer-length.lsp
index 075e800b96598b3fb2309f285185f489c092f186..ca0a2372c7ccf3341db5a3fce0d1a418c2e0d14a 100644
--- a/numbers/integer-length.lsp
+++ b/numbers/integer-length.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Sep  7 10:10:10 2003
 ;;;; Contains: Tests for INTEGER-LENGTH
 
-(in-package :cl-test)
+
 
 (deftest integer-length.error.1
   (signals-error (integer-length) program-error)
diff --git a/numbers/integerp.lsp b/numbers/integerp.lsp
index 9e3350e995755f6be466c86c65bf3998edf1dc10..0d591073b495f5b78dffffc0febe77392b89ee5a 100644
--- a/numbers/integerp.lsp
+++ b/numbers/integerp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Sep  7 10:18:34 2003
 ;;;; Contains: Tests for INTEGERP
 
-(in-package :cl-test)
+
 
 (deftest integerp.error.1
   (signals-error (integerp) program-error)
diff --git a/numbers/isqrt.lsp b/numbers/isqrt.lsp
index d25c65f179bf34436d0ef01dc31525b785400dda..f0afefa9e65fa1475b097223c3205953f4797f41 100644
--- a/numbers/isqrt.lsp
+++ b/numbers/isqrt.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Sep  6 15:40:09 2003
 ;;;; Contains: Tests of ISQRT
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/lcm.lsp b/numbers/lcm.lsp
index 7a104c5b9e9788f2a5ba74ebd594c32f38ce5870..7812ce5229f04b93cf6c7d1209f8eec47924934f 100644
--- a/numbers/lcm.lsp
+++ b/numbers/lcm.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Sep  4 22:03:21 2003
 ;;;; Contains: Tests of LCM
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/ldb.lsp b/numbers/ldb.lsp
index 586034e07b3d66d21d4407303575824a2381ca04..e6f5b4e7b05ce92f1d0cf01b4254076d703b491a 100644
--- a/numbers/ldb.lsp
+++ b/numbers/ldb.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Sep 11 20:45:17 2003
 ;;;; Contains: Tests of LDB
 
-(in-package :cl-test)
+
 
 ;;; Error tests
 
diff --git a/numbers/load.lsp b/numbers/load.lsp
index f0dd77dc505e083274ad48ea344f889e4160edd7..619e4656ecfd189b9c64fa15b2898c3f08d00bae 100644
--- a/numbers/load.lsp
+++ b/numbers/load.lsp
@@ -3,8 +3,6 @@
 ;;;; Created:  Mon Apr  7 07:16:44 2003
 ;;;; Contains: Forms to load files containing tests of number concepts
 
-(in-package :cl-test)
-
 (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")
@@ -21,7 +19,11 @@
 (compile-and-load "ANSI-TESTS:AUX;gcd-aux.lsp")
 (compile-and-load "ANSI-TESTS:AUX;types-aux.lsp")
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "number-comparison.lsp")
   (load "max.lsp")
   (load "min.lsp")
@@ -126,5 +128,5 @@
 
   (load "upgraded-complex-part-type.lsp")
 
-  (load "earithmetic-error.lsp")
+  (load "arithmetic-error.lsp")
 )
diff --git a/numbers/log.lsp b/numbers/log.lsp
index dd82d25a81de639fa349e5d01951d32726c63e02..578c6e018ee7105dc24734d20a662ac92a9e125b 100644
--- a/numbers/log.lsp
+++ b/numbers/log.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Feb 11 19:53:33 2004
 ;;;; Contains: Tests of LOG
 
-(in-package :cl-test)
+
 
 (deftest log.1
   (let ((result (log 1)))
diff --git a/numbers/logand.lsp b/numbers/logand.lsp
index d38fde00ddda6419b7117d70b0305a845cb8f432..5373894df607335d55629d6cdecfc70e7118fdc4 100644
--- a/numbers/logand.lsp
+++ b/numbers/logand.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Sep  8 21:23:22 2003
 ;;;; Contains: Tests of LOGAND
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/logandc1.lsp b/numbers/logandc1.lsp
index d052d8388bc969d3c7e919f2086276f66a22e421..4ebc099bca72350f5b3ef55eabe39d9ec2e86b34 100644
--- a/numbers/logandc1.lsp
+++ b/numbers/logandc1.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Sep  8 21:47:22 2003
 ;;;; Contains: Tests of LOGANDC1
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/logandc2.lsp b/numbers/logandc2.lsp
index 4712b221104b612791ac17f0682385cccecf2622..4ab506e80f485ff338ed6408dac28c143902fb49 100644
--- a/numbers/logandc2.lsp
+++ b/numbers/logandc2.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Sep  9 05:52:31 2003
 ;;;; Contains: Tests of LOGANDC2
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/logbitp.lsp b/numbers/logbitp.lsp
index dfd4fe6b81f4b668b456029695b77c374085d4f8..b1def1eb1924bd903e37655e192810daad6ab5d3 100644
--- a/numbers/logbitp.lsp
+++ b/numbers/logbitp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Sep  9 07:02:00 2003
 ;;;; Contains: Tests of LOGBITP
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/logcount.lsp b/numbers/logcount.lsp
index 47a623de97861a586234e2705175e0a6dcafafe6..c571635c636e8f55e4ac48b0b992d2ccdbed06c5 100644
--- a/numbers/logcount.lsp
+++ b/numbers/logcount.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Sep 11 23:12:56 2003
 ;;;; Contains: Tests of LOGCOUNT
 
-(in-package :cl-test)
+
 
 ;;; Error tests
 
diff --git a/numbers/logeqv.lsp b/numbers/logeqv.lsp
index b06a0a8dbd2322eba9dea374af4bd198318ee19b..eeeef558a6ed57b1d76d2d29fc73c635a53d1772 100644
--- a/numbers/logeqv.lsp
+++ b/numbers/logeqv.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Sep  9 05:55:23 2003
 ;;;; Contains: Tests of LOGEQV
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/logior.lsp b/numbers/logior.lsp
index 4ebca6dfe3f11ba9ce62bbc156835dab1434cc02..b4732ab4fb073e8bd0f6ed7b3014e830f200d1e6 100644
--- a/numbers/logior.lsp
+++ b/numbers/logior.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Sep  9 06:08:21 2003
 ;;;; Contains: Tests of LOGIOR
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/lognand.lsp b/numbers/lognand.lsp
index d0c81b28d19ddffe8ec90a8aab674b193058045f..cecebf1b4dd9fb9243b6fda7abc7451f72e2277f 100644
--- a/numbers/lognand.lsp
+++ b/numbers/lognand.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Sep  9 06:11:12 2003
 ;;;; Contains: Tests of LOGNAND
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/lognor.lsp b/numbers/lognor.lsp
index aa4dddaf77095ce4152901bc27d4f8961379dda6..a081abbecd31678a8d50bd9c48e962b966a63ae4 100644
--- a/numbers/lognor.lsp
+++ b/numbers/lognor.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Sep  9 06:14:35 2003
 ;;;; Contains: Tests of LOGNOR
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/lognot.lsp b/numbers/lognot.lsp
index 00e7ec7dc5bb551532f02b6f9aba4021aca4951d..6247f6c26eb2d0221d3bbef4f1d96c71b32e82d6 100644
--- a/numbers/lognot.lsp
+++ b/numbers/lognot.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Sep  9 06:16:20 2003
 ;;;; Contains: Tests of LOGNOT
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/logorc1.lsp b/numbers/logorc1.lsp
index 294413cd092e11d153f607220b5454e4b556af3c..69de8b99d11c598a1f7115abd0dfddc61b2c753b 100644
--- a/numbers/logorc1.lsp
+++ b/numbers/logorc1.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Sep  9 06:23:43 2003
 ;;;; Contains: Tests of LOGORC1
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/logorc2.lsp b/numbers/logorc2.lsp
index d5053ec0232392d2d519ccd269fdecc57b5aa59f..d6365ee1cfc235dc7bc0a1bbb713d0721bbb0fe6 100644
--- a/numbers/logorc2.lsp
+++ b/numbers/logorc2.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Sep  9 06:27:45 2003
 ;;;; Contains: Tests of LOGORC2
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/logtest.lsp b/numbers/logtest.lsp
index 64ca631797ef9bfc576dd42a9d8239231b5ec828..2ba24eb28e5b2cffb35aef84050c5013e8289fed 100644
--- a/numbers/logtest.lsp
+++ b/numbers/logtest.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Sep 11 23:22:46 2003
 ;;;; Contains: Tests for LOGTEST
 
-(in-package :cl-test)
+
 
 ;;; Error tests
 
diff --git a/numbers/logxor.lsp b/numbers/logxor.lsp
index cb7b1274a1d9eefade3f8b04f63bb84b1263200f..dc23a50f74c3791db12aded6e3e5b52b97eefb0c 100644
--- a/numbers/logxor.lsp
+++ b/numbers/logxor.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Sep  9 06:30:57 2003
 ;;;; Contains: Tests of LOGXOR
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/make-random-state.lsp b/numbers/make-random-state.lsp
index 02b1b03acd87c70c9028ef2da4a58ea028dff7af..f405c3ff828cbad4e4e6ab32ef08e73368680f3a 100644
--- a/numbers/make-random-state.lsp
+++ b/numbers/make-random-state.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Sep  6 17:53:30 2003
 ;;;; Contains: Tests of MAKE-RANDOM-STATE
 
-(in-package :cl-test)
+
 
 ;;; Error tests
 
diff --git a/numbers/mask-field.lsp b/numbers/mask-field.lsp
index ea7ce2335e6fc8318cde1ef5613b1ad915ec07c1..7d2a244c54f11425014706d0d746f4544fe2e3a0 100644
--- a/numbers/mask-field.lsp
+++ b/numbers/mask-field.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Sep 11 21:27:13 2003
 ;;;; Contains: Tests of MASK-FIELD
 
-(in-package :cl-test)
+
 
 ;;; Error tests
 
diff --git a/numbers/max.lsp b/numbers/max.lsp
index e70bc08a4423ed3289ccf30b7bc439bdbc275a5c..8d82470c430e3837506a224547908faec95d2267 100644
--- a/numbers/max.lsp
+++ b/numbers/max.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Aug  3 15:55:17 2003
 ;;;; Contains: Tests of MAX
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/min.lsp b/numbers/min.lsp
index 8ad55904f5ef102d21aadd552795125f84a4fe27..e6107ff1c276135c3e8394ba00b7d0aaba312a32 100644
--- a/numbers/min.lsp
+++ b/numbers/min.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Aug  4 21:24:45 2003
 ;;;; Contains: Tests of MIN
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/minus.lsp b/numbers/minus.lsp
index 0dd4e4bfafb82a86b43bbd462dab4315315d1761..b0514b350cd522fd72a048b1e56f66d1170755c4 100644
--- a/numbers/minus.lsp
+++ b/numbers/minus.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Aug 31 11:15:14 2003
 ;;;; Contains: Tests of the - function
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/minusp.lsp b/numbers/minusp.lsp
index 7a0c78cfb0c662a558254f2e6bf24c26dd99f96c..dd58a39501b5f6a81fd1ce6ba66733d38f650222 100644
--- a/numbers/minusp.lsp
+++ b/numbers/minusp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Aug  4 21:33:44 2003
 ;;;; Contains: Tests of MINUSP
 
-(in-package :cl-test)
+
 
 (deftest minusp.error.1
   (signals-error (minusp) program-error)
diff --git a/numbers/number-comparison.lsp b/numbers/number-comparison.lsp
index e558b49e24154d723214cdc97ce53838330e0378..6142b3b5d672d731d7ef28d67f7086e7607b6675 100644
--- a/numbers/number-comparison.lsp
+++ b/numbers/number-comparison.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Apr  7 07:17:42 2003
 ;;;; Contains: Tests of =, /=, <, <=, >, >=
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/numberp.lsp b/numbers/numberp.lsp
index 08931f781bef24fbabae96f96f9be174a82c32dc..625b0b378c18b2006eb0ab8f4d556f0c5f1cea58 100644
--- a/numbers/numberp.lsp
+++ b/numbers/numberp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Sep  6 18:20:36 2003
 ;;;; Contains: Tests of NUMBERP
 
-(in-package :cl-test)
+
 
 (deftest numberp.error.1
   (signals-error (numberp) program-error)
diff --git a/numbers/numerator-denominator.lsp b/numbers/numerator-denominator.lsp
index 7e3b186ceb093bec54b544984ccec836cf3f2dab..a9dab6517d1b643ac4dff0f7c05ba47f0857791f 100644
--- a/numbers/numerator-denominator.lsp
+++ b/numbers/numerator-denominator.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Sep  7 08:24:57 2003
 ;;;; Contains: Tests of NUMERATOR, DENOMINATOR
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/oddp.lsp b/numbers/oddp.lsp
index 3b4eaf2d02b586d334007a7d26953d419efd6747..ce43020aa4e4be42ae2ea962e7ea67319ecd086a 100644
--- a/numbers/oddp.lsp
+++ b/numbers/oddp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Aug 31 10:48:25 2003
 ;;;; Contains: Tests of ODDP
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/oneminus.lsp b/numbers/oneminus.lsp
index d99c730a68fc9459e98917d26e6b7f22b6e23dea..61d57198d50a144b3dde8c21eeb70ebfb8eeb8a8 100644
--- a/numbers/oneminus.lsp
+++ b/numbers/oneminus.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Sep  1 20:14:34 2003
 ;;;; Contains: Tests of 1-
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/oneplus.lsp b/numbers/oneplus.lsp
index 7b555d6f36f9a39f594f1409909220c08a0546c9..80a6830b028057ff5e2b9e802b3a224e3dd5f0ca 100644
--- a/numbers/oneplus.lsp
+++ b/numbers/oneplus.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Sep  1 19:53:34 2003
 ;;;; Contains: Tests of 1+
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/parse-integer.lsp b/numbers/parse-integer.lsp
index 35063b5cfd99139a4adfff63dd58f58c1780da96..61ee3798d24c04c2198ce18e38812ae5d8175721 100644
--- a/numbers/parse-integer.lsp
+++ b/numbers/parse-integer.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Sep  7 10:24:13 2003
 ;;;; Contains: Tests of PARSE-INTEGER
 
-(in-package :cl-test)
+
 
 (deftest parse-integer.error.1
   (signals-error (parse-integer) program-error)
diff --git a/numbers/phase.lsp b/numbers/phase.lsp
index b447f66ee57e7b32045a6378afd9519588449647..40c4cee4980eb0cc777a2596df82ed81801f1d51 100644
--- a/numbers/phase.lsp
+++ b/numbers/phase.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Sep  6 21:15:54 2003
 ;;;; Contains: Tests of PHASE
 
-(in-package :cl-test)
+
 
 (deftest phase.error.1
   (signals-error (phase) program-error)
diff --git a/numbers/plus.lsp b/numbers/plus.lsp
index bf11e31a3b23ce22fc799416ea341b05a8019b3e..5915459b553f3d20387b7c38036a7557269eaebf 100644
--- a/numbers/plus.lsp
+++ b/numbers/plus.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Aug 31 04:34:17 2003
 ;;;; Contains: Tests of the function +
 
-(in-package :cl-test)
+
 
 
 ;;; (compile-and-load "plus-aux.lsp")
diff --git a/numbers/plusp.lsp b/numbers/plusp.lsp
index 8d0e5a2091862dd39b56028520cd46c8bc2e00cc..7b5060b4ab339a81bdd8e38da91a60e88f9dbdbc 100644
--- a/numbers/plusp.lsp
+++ b/numbers/plusp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Aug  4 21:42:14 2003
 ;;;; Contains: Tests for PLUSP
 
-(in-package :cl-test)
+
 
 ;;; Error tests
 
diff --git a/numbers/random-state-p.lsp b/numbers/random-state-p.lsp
index 0b78c8384218813d00f6ed83dae140c02a3ae1b2..7be657742d4bb7d774a66e2f621fc823f1bfe7f4 100644
--- a/numbers/random-state-p.lsp
+++ b/numbers/random-state-p.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Sep  6 17:50:04 2003
 ;;;; Contains: Tests of RANDOM-STATE-P
 
-(in-package :cl-test)
+
 
 (deftest random-state-p.error.1
   (signals-error (random-state-p) program-error)
diff --git a/numbers/random.lsp b/numbers/random.lsp
index c9b2cbe8a611a397df7bd199bb67dcdb3f3f45c2..a6ab34ce29554c2deef4efdb9785b6cd6908ab57 100644
--- a/numbers/random.lsp
+++ b/numbers/random.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Sep  6 15:47:42 2003
 ;;;; Contains: Tests of RANDOM
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/rational.lsp b/numbers/rational.lsp
index 715ad64746ff8e140a76b62e2643c689fa487c9a..7e0d3b73ff0753ff750e52c03bfda921809e3ada 100644
--- a/numbers/rational.lsp
+++ b/numbers/rational.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Sep  1 13:49:18 2003
 ;;;; Contains: Tests of RATIONAL
 
-(in-package :cl-test)
+
 
 (deftest rational.error.1
   (signals-error (rational) program-error)
diff --git a/numbers/rationalize.lsp b/numbers/rationalize.lsp
index 800f1d791529ce463abb356ab58dd30754f89430..11418f5b00c943250cde71b57b8277ec206d5f96 100644
--- a/numbers/rationalize.lsp
+++ b/numbers/rationalize.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Sep  1 14:00:45 2003
 ;;;; Contains: Tests of RATIONALIZE
 
-(in-package :cl-test)
+
 
 (deftest rationalize.error.1
   (signals-error (rationalize) program-error)
diff --git a/numbers/rationalp.lsp b/numbers/rationalp.lsp
index 4524894f177fafc56908a24dc005d10eff13757b..e43c53ce90ba7b37cc744ad5cfad47e4e3e772e7 100644
--- a/numbers/rationalp.lsp
+++ b/numbers/rationalp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Sep  7 08:36:31 2003
 ;;;; Contains: Tests of RATIONALP
 
-(in-package :cl-test)
+
 
 (deftest rationalp.error.1
   (signals-error (rationalp) program-error)
diff --git a/numbers/real.lsp b/numbers/real.lsp
index b25851cb333cef181ed3dfefa3d16dfe93c4ab03..fc9941bfdf51301b886b768d51cf16d5f5ebfe96 100644
--- a/numbers/real.lsp
+++ b/numbers/real.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Oct 31 21:41:49 2004
 ;;;; Contains: Additional tests of the REAL type specifier
 
-(in-package :cl-test)
+
 
 (deftest real.1
   (loop for i = 1 then (ash i 1)
diff --git a/numbers/realp.lsp b/numbers/realp.lsp
index 8cbf4e9e8c21de6ced74a6f53a4730687dfad8aa..affb15be9d931c3271ac5f4a24d301147f3a26d7 100644
--- a/numbers/realp.lsp
+++ b/numbers/realp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Sep  7 08:22:06 2003
 ;;;; Contains: Tests of REALP
 
-(in-package :cl-test)
+
 
 (deftest realp.error.1
   (signals-error (realp) program-error)
diff --git a/numbers/realpart.lsp b/numbers/realpart.lsp
index 6b3c487b11e054d77798188084debfc165c868c2..cac22d601e524e8c00ec38997f4f00b3a34426a5 100644
--- a/numbers/realpart.lsp
+++ b/numbers/realpart.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Sep  7 07:41:15 2003
 ;;;; Contains: Tests of REALPART
 
-(in-package :cl-test)
+
 
 (deftest realpart.error.1
   (signals-error (realpart) program-error)
diff --git a/numbers/round.lsp b/numbers/round.lsp
index bbef136dab03b5c75e54279f0a6c1004bc1e46f6..45161134cf08bbe85a89d45ed3eaf77dbbe9ab8f 100644
--- a/numbers/round.lsp
+++ b/numbers/round.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Aug 21 13:39:56 2003
 ;;;; Contains: Tests of ROUND
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/signum.lsp b/numbers/signum.lsp
index 2c80c3965810ce516dd0469a7f0435427e2efe09..39edf5145feaeec809bb3631c12d905a13536033 100644
--- a/numbers/signum.lsp
+++ b/numbers/signum.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Sep  4 22:29:09 2003
 ;;;; Contains: Tests of SIGNUM
 
-(in-package :cl-test)
+
 
 (deftest signum.error.1
   (signals-error (signum) program-error)
diff --git a/numbers/sin.lsp b/numbers/sin.lsp
index 8272bff5d9ebea10a70408e27f31f8cbd4602961..17c08e55f7fd58b5aaca558d93466ee9f47bf4b8 100644
--- a/numbers/sin.lsp
+++ b/numbers/sin.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Feb  9 20:20:46 2004
 ;;;; Contains: Tests for SIN
 
-(in-package :cl-test)
+
 
 (deftest sin.1
   (loop for i from -1000 to 1000
diff --git a/numbers/sinh.lsp b/numbers/sinh.lsp
index 91970caf50cdabdc3cc20a619270289476ed08b9..18324312e35e436683091b824e4bb291f2c0be18 100644
--- a/numbers/sinh.lsp
+++ b/numbers/sinh.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Feb 11 06:29:51 2004
 ;;;; Contains: Tests for SINH
 
-(in-package :cl-test)
+
 
 (deftest sinh.1
   (let ((result (sinh 0)))
diff --git a/numbers/sqrt.lsp b/numbers/sqrt.lsp
index a085f6032b88b04a82ab4431e67ca8d94850a250..067adadb360fb5b9525815e1fec5a64061dde99d 100644
--- a/numbers/sqrt.lsp
+++ b/numbers/sqrt.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Sep  6 10:54:17 2003
 ;;;; Contains: Tests of SQRT
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/tan.lsp b/numbers/tan.lsp
index db6e0e745d13dd9e90c220e4ed4f7550cdf36b2e..56ed024d09c3cf74fc0bd65a80389a1caa8b2ad0 100644
--- a/numbers/tan.lsp
+++ b/numbers/tan.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Feb  9 20:55:40 2004
 ;;;; Contains: Tests of TAN
 
-(in-package :cl-test)
+
 
 (deftest tan.1
   (loop for i from -1000 to 1000
diff --git a/numbers/tanh.lsp b/numbers/tanh.lsp
index f120e6d0170dcd0c11e089741ec982246f3c0e6d..bbbc6a1245d79ddbd3671d707da1a7d4e8d237e8 100644
--- a/numbers/tanh.lsp
+++ b/numbers/tanh.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Feb 11 19:16:35 2004
 ;;;; Contains: Tests of TANH
 
-(in-package :cl-test)
+
 
 (deftest tanh.1
   (let ((result (tanh 0)))
diff --git a/numbers/times.lsp b/numbers/times.lsp
index 21ededbda4909436c008cd2d23ca3fdf21695ad1..89b70266f6b51040e7bf73d6f7048f1157b6c837 100644
--- a/numbers/times.lsp
+++ b/numbers/times.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Aug 28 10:41:34 2003
 ;;;; Contains: Tests of the multiplication function *
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/truncate.lsp b/numbers/truncate.lsp
index 9222fec24f205f01f039f88c62512d561177e87a..0188e4f36124334f280c81139275fc59c9c8ab52 100644
--- a/numbers/truncate.lsp
+++ b/numbers/truncate.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Aug 20 05:13:26 2003
 ;;;; Contains: Tests of TRUNCATE
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/upgraded-complex-part-type.lsp b/numbers/upgraded-complex-part-type.lsp
index addc61fd6b5c795bc89c561112c15dc7ce9c2384..a520480c842bbfc12896bc32ef27260642ea3080 100644
--- a/numbers/upgraded-complex-part-type.lsp
+++ b/numbers/upgraded-complex-part-type.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Nov 27 21:15:46 2004
 ;;;; Contains: Tests of UPGRADE-COMPLEX-PART-TYPE
 
-(in-package :cl-test)
+
 
 
 
diff --git a/numbers/zerop.lsp b/numbers/zerop.lsp
index 53068c60635753869646c68731d74272c0a805e7..17fe40028cead50f652cca9d595d2081f81f2d29 100644
--- a/numbers/zerop.lsp
+++ b/numbers/zerop.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Aug  4 21:47:34 2003
 ;;;; Contains: Tests of ZEROP
 
-(in-package :cl-test)
+
 
 (deftest zerop.error.1
   (signals-error (zerop) program-error)
diff --git a/objects/add-method.lsp b/objects/add-method.lsp
index 75e0fef7b0c80c2b4971432dc476c84638488c1c..3557a653820008447c8a62004990a0e22c3649e3 100644
--- a/objects/add-method.lsp
+++ b/objects/add-method.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Jun  4 19:12:25 2003
 ;;;; Contains: Tests for ADD-METHOD
 
-(in-package :cl-test)
+
 
 (defgeneric add-method-gf-01 (x)
   (:method ((x t)) 'a))
diff --git a/objects/allocate-instance.lsp b/objects/allocate-instance.lsp
index d69d8318a5b1cfd84c68a5c6f4a573cc2ae2b9a8..7aa665d358b61db37174ffe2c11c73c6a8f2c573 100644
--- a/objects/allocate-instance.lsp
+++ b/objects/allocate-instance.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Apr 28 21:06:58 2003
 ;;;; Contains: Tests of ALLOCATE-INSTANCE
 
-(in-package :cl-test)
+
 
 ;;; According to the CLHS, the meaning of adding methods to
 ;;; ALLOCATE-INSTANCE is unspecified, so this will not be tested
diff --git a/objects/call-next-method.lsp b/objects/call-next-method.lsp
index 8f4ec10b2aa9d37ab4c84f490a968d191ed882f6..528eb9be99b4668d2ad573619fd5960482bb597b 100644
--- a/objects/call-next-method.lsp
+++ b/objects/call-next-method.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 31 11:18:15 2003
 ;;;; Contains: Tests of CALL-NEXT-METHOD
 
-(in-package :cl-test)
+
 
 ;;; Tests where there is no next method are in no-next-method.lsp
 
diff --git a/objects/change-class.lsp b/objects/change-class.lsp
index ac5b9d71298be757004d7934794404221adc0c87..e344e88f1d0d2ef89867af2773693660ec15b80d 100644
--- a/objects/change-class.lsp
+++ b/objects/change-class.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May  3 14:23:29 2003
 ;;;; Contains: Tests of CHANGE-CLASS
 
-(in-package :cl-test)
+
 
 (defclass change-class-class-01a ()
   ((a :initarg :a) (b :initarg :b) (c :initarg :c)))
diff --git a/objects/class-name.lsp b/objects/class-name.lsp
index a109cce7e7db7aaaf85776fe27229721a3959a23..fb4854fe732612cd32a7a2408150a0e1d404f7b8 100644
--- a/objects/class-name.lsp
+++ b/objects/class-name.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jun 15 12:05:47 2003
 ;;;; Contains: Tests of CLASS-NAME
 
-(in-package :cl-test)
+
 
 ;;; This is mostly tested elsewhere.
 
diff --git a/objects/class-of.lsp b/objects/class-of.lsp
index 995df09a8a74dec887538ea84cc5a068d2c71762..f585ef69eceecddacb967c8c97075d6e2edd370e 100644
--- a/objects/class-of.lsp
+++ b/objects/class-of.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Jun 16 19:40:32 2003
 ;;;; Contains: Tests of CLASS-OF
 
-(in-package :cl-test)
+
 
 ;;; Most tests of CLASS-OF are in other files
 
diff --git a/objects/compute-applicable-methods.lsp b/objects/compute-applicable-methods.lsp
index 40aa4a1d6c2325390a725585aed12a9d9fa8fd61..3400dfcc6a6def394009e0ea8b8eaf53ac142300 100644
--- a/objects/compute-applicable-methods.lsp
+++ b/objects/compute-applicable-methods.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Jun  2 06:40:41 2003
 ;;;; Contains: Tests for COMPUTE-APPLICABLE-METHODS
 
-(in-package :cl-test)
+
 
 (defgeneric cam-gf-01 (x y))
 
diff --git a/objects/defclass-01.lsp b/objects/defclass-01.lsp
index 85a600bc24dd51e95c6b8d7e6fb1fd3c549b22f7..76ba329269cb2a5752dbd4f799ae8f914146c899 100644
--- a/objects/defclass-01.lsp
+++ b/objects/defclass-01.lsp
@@ -3,9 +3,6 @@
 ;;;; Created:  Sun Apr 20 20:58:54 2003
 ;;;; Contains: Tests for DEFCLASS, part 01
 
-
-(in-package :cl-test)
-
 ;;; I've decided to write some 'manual' tests, then refactor these back
 ;;; to the automatic mechanisms I'll put into defclass-aux.lsp after
 ;;; I have a better understanding of the object system
diff --git a/objects/defclass-02.lsp b/objects/defclass-02.lsp
index eca1f66fd471db3dc2f943a6fd8573d4178d26bf..9f3c2ff821a8f9bbdfb4969ae5b20007ccc7ec56 100644
--- a/objects/defclass-02.lsp
+++ b/objects/defclass-02.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Apr 25 07:16:57 2003
 ;;;; Contains: Tests of DEFCLASS with simple inheritance
 
-(in-package :cl-test)
+
 
 ;;;
 
diff --git a/objects/defclass-03.lsp b/objects/defclass-03.lsp
index 8f22ea3ab6c85ef02eff7a513b0d7429067d2e6e..da4c319a2313d11765a12b788bef7ffb41432a10 100644
--- a/objects/defclass-03.lsp
+++ b/objects/defclass-03.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Apr 27 16:23:59 2003
 ;;;; Contains: Tests of DEFCLASS with more involved inheritance
 
-(in-package :cl-test)
+
 
 ;;;
 
diff --git a/objects/defclass-errors.lsp b/objects/defclass-errors.lsp
index 24de5646d45435101059ce9a98c3ae9e9a8f49ee..209a20e2777db25ab5ad0c2aa73d62213d4ac9f2 100644
--- a/objects/defclass-errors.lsp
+++ b/objects/defclass-errors.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Fri Apr 25 06:59:22 2003
 ;;;; Contains: Error case tests for DEFCLASS
 
-(in-package :cl-test)
+
 
 ;;; I created some redundant tests by accident.  This list of
 ;;; tests could be reduced in size.
diff --git a/objects/defclass-forward-reference.lsp b/objects/defclass-forward-reference.lsp
index 1013bb4dbe561def3bb9486ca12d65ca95c1bb31..20af04ade425b0cc0ec7f89e674b8afd689a157a 100644
--- a/objects/defclass-forward-reference.lsp
+++ b/objects/defclass-forward-reference.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Apr  2 22:53:27 2003
 ;;;; Contains: Tests for definitions of classes with forward references
 
-(in-package :cl-test)
+
 
 (deftest defclass.forward-ref.1
   (let ((c1 (gensym))
diff --git a/objects/defclass.lsp b/objects/defclass.lsp
index 2aeb74bcbd66495267f6ae7e5e52fc1900e4afcf..594e66e0b63be40ca00177d0a84b219497d3113d 100644
--- a/objects/defclass.lsp
+++ b/objects/defclass.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Mar 24 03:39:54 2003
 ;;;; Contains: Tests of DEFCLASS
 
-(in-package :cl-test)
+
 
 (defclass-with-tests defclass-1 nil nil)
 (defclass-with-tests defclass-2 nil (slot1 slot2 slot3))
diff --git a/objects/defgeneric-method-combination-and.lsp b/objects/defgeneric-method-combination-and.lsp
index af5396cabdfe7e1021774c7eb2966925099c993d..8b21d7afcde8cca02a4731dcd8108fe063ae7b64 100644
--- a/objects/defgeneric-method-combination-and.lsp
+++ b/objects/defgeneric-method-combination-and.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 24 21:31:55 2003
 ;;;; Contains: Tests of DEFGENERIC with :method-combination AND
 
-(in-package :cl-test)
+
 
 (declaim (special *x*))
 
diff --git a/objects/defgeneric-method-combination-append.lsp b/objects/defgeneric-method-combination-append.lsp
index 38987d7ba72b6b95806b20a36137b8c5a7791ce0..97032e567180cf87f7de38b915015854f1a8a3ba 100644
--- a/objects/defgeneric-method-combination-append.lsp
+++ b/objects/defgeneric-method-combination-append.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 24 21:31:55 2003
 ;;;; Contains: Tests of DEFGENERIC with :method-combination APPEND
 
-(in-package :cl-test)
+
 
 (declaim (special *x*))
 
diff --git a/objects/defgeneric-method-combination-aux.lsp b/objects/defgeneric-method-combination-aux.lsp
index c2a8edd96e34a93d7717f3f801f3324334895193..f0d75038b003bdbb09e0cca4358f687fe2079a78 100644
--- a/objects/defgeneric-method-combination-aux.lsp
+++ b/objects/defgeneric-method-combination-aux.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed May 28 14:02:42 2003
 ;;;; Contains: Class definitions for defgeneric-method-combination-*.lsp
 
-(in-package :cl-test)
+
 
 (defclass dgmc-class-01 () ())
 (defclass dgmc-class-02 (dgmc-class-01) ())
diff --git a/objects/defgeneric-method-combination-list.lsp b/objects/defgeneric-method-combination-list.lsp
index 860285a3bcef19e4f831af50f82af3306cb99214..8ad8755ed02d30483171e407ea4fa1def6891c5d 100644
--- a/objects/defgeneric-method-combination-list.lsp
+++ b/objects/defgeneric-method-combination-list.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 24 21:31:55 2003
 ;;;; Contains: Tests of DEFGENERIC with :method-combination LIST
 
-(in-package :cl-test)
+
 
 (declaim (special *x*))
 
diff --git a/objects/defgeneric-method-combination-max.lsp b/objects/defgeneric-method-combination-max.lsp
index b966d0b413867ecea65dfc87fdb8fb46126a742b..3275234fff512c59ea9334df6fb57d904cbd4695 100644
--- a/objects/defgeneric-method-combination-max.lsp
+++ b/objects/defgeneric-method-combination-max.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 24 21:31:55 2003
 ;;;; Contains: Tests of DEFGENERIC with :method-combination MAX
 
-(in-package :cl-test)
+
 
 (declaim (special *x*))
 
diff --git a/objects/defgeneric-method-combination-min.lsp b/objects/defgeneric-method-combination-min.lsp
index 2aca3715945cd038713e1db93b76d4ccced63333..41b9e38b445399f830f2326d163b497d8be0112f 100644
--- a/objects/defgeneric-method-combination-min.lsp
+++ b/objects/defgeneric-method-combination-min.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 24 21:31:55 2003
 ;;;; Contains: Tests of DEFGENERIC with :method-combination MIN
 
-(in-package :cl-test)
+
 
 (declaim (special *x*))
 
diff --git a/objects/defgeneric-method-combination-nconc.lsp b/objects/defgeneric-method-combination-nconc.lsp
index 3d39aee60445072bd0ac9466148a79f6ea2a778b..f9a7d34f774245fa92f3babe72bf8fd15a68f153 100644
--- a/objects/defgeneric-method-combination-nconc.lsp
+++ b/objects/defgeneric-method-combination-nconc.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 24 21:31:55 2003
 ;;;; Contains: Tests of DEFGENERIC with :method-combination NCONC
 
-(in-package :cl-test)
+
 
 (declaim (special *x*))
 
diff --git a/objects/defgeneric-method-combination-or.lsp b/objects/defgeneric-method-combination-or.lsp
index 9b00e3ec3b831e714ef6f01be73d4e9df1d8955b..839bd0315da8cef0506e139b0d7f5d5c0fb039a6 100644
--- a/objects/defgeneric-method-combination-or.lsp
+++ b/objects/defgeneric-method-combination-or.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 24 21:31:55 2003
 ;;;; Contains: Tests of DEFGENERIC with :method-combination OR
 
-(in-package :cl-test)
+
 
 (declaim (special *x*))
 
diff --git a/objects/defgeneric-method-combination-plus.lsp b/objects/defgeneric-method-combination-plus.lsp
index 4959d6ac959f1a13618fc6cb0be06d77ae31c8e6..74b68f6365414b3ccfc5b0938f65fea28be8b76c 100644
--- a/objects/defgeneric-method-combination-plus.lsp
+++ b/objects/defgeneric-method-combination-plus.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 24 21:31:55 2003
 ;;;; Contains: Tests of DEFGENERIC with :method-combination +
 
-(in-package :cl-test)
+
 
 (declaim (special *x*))
 
diff --git a/objects/defgeneric-method-combination-progn.lsp b/objects/defgeneric-method-combination-progn.lsp
index c90af10eea70483702663bb69151ba788e7dc0ef..64293eac74b93df777117dc8f90e0850ba479312 100644
--- a/objects/defgeneric-method-combination-progn.lsp
+++ b/objects/defgeneric-method-combination-progn.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 24 21:31:55 2003
 ;;;; Contains: Tests of DEFGENERIC with :method-combination OR
 
-(in-package :cl-test)
+
 
 (declaim (special *x*))
 
diff --git a/objects/defgeneric.lsp b/objects/defgeneric.lsp
index 327e0532d9073cef0272fe2ef811ae90dbd71962..4faf5c1f5a0193078644882527c8b7ca1dbc3dea 100644
--- a/objects/defgeneric.lsp
+++ b/objects/defgeneric.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 17 20:55:50 2003
 ;;;; Contains: Tests of DEFGENERIC
 
-(in-package :cl-test)
+
 
 ;;; Various error cases
 
diff --git a/objects/define-method-combination-long-form.lsp b/objects/define-method-combination-long-form.lsp
index 894333f221cb269957aeef591f0999c79b2b2ea1..a5c3e8c4c9e7a8c8142ff2d3a163e5654114c130 100644
--- a/objects/define-method-combination-long-form.lsp
+++ b/objects/define-method-combination-long-form.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jul 13 08:26:41 2003
 ;;;; Contains: Tests of DEFINE-METHOD-COMBINATION (long form)
 
-(in-package :cl-test)
+
 
 (eval-when (:load-toplevel :compile-toplevel :execute)
   (report-and-ignore-errors
diff --git a/objects/define-method-combination.lsp b/objects/define-method-combination.lsp
index 2b7dc924bc658a9dc481b3c9a3269522b8293483..fa6c67f2d45d1a034cb5dc05896ce7de523608ea 100644
--- a/objects/define-method-combination.lsp
+++ b/objects/define-method-combination.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jun 15 10:49:39 2003
 ;;;; Contains: Tests of DEFINE-METHOD-COMBINATION
 
-(in-package :cl-test)
+
 
 (defclass dmc-class-01a () ())
 (defclass dmc-class-01b (dmc-class-01a) ())
diff --git a/objects/defmethod.lsp b/objects/defmethod.lsp
index 6d2e31780f6ee53cb8d0f5e66711721c994b9498..afde8838ca2c4891f5dfa808ebfd683ad04f2553 100644
--- a/objects/defmethod.lsp
+++ b/objects/defmethod.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Jun  9 07:02:53 2005
 ;;;; Contains: Separate tests for DEFMETHOD
 
-(in-package :cl-test)
+
 
 (deftest defmethod.1
   (let ((sym (gensym)))
diff --git a/objects/ensure-generic-function.lsp b/objects/ensure-generic-function.lsp
index d1c06617400417437214da0bf848bb9e12e9634d..0c21da70e7b42d868f8e35a6fe4a33ffc02cfc38 100644
--- a/objects/ensure-generic-function.lsp
+++ b/objects/ensure-generic-function.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Mar 27 21:29:53 2003
 ;;;; Contains: Tests for ENSURE-GENERIC-FUNCTION
 
-(in-package :cl-test)
+
 
 (deftest ensure-generic-function.1
   (if (typep #'car 'generic-function)
diff --git a/objects/find-class.lsp b/objects/find-class.lsp
index d897ed3a3a041ade9ecff663810df36d50027600..5196571b0f442aa20f53e82c9bbc49813f37320e 100644
--- a/objects/find-class.lsp
+++ b/objects/find-class.lsp
@@ -5,7 +5,7 @@
 
 ;; find-class is also tested in numerous other places.
 
-(in-package :cl-test)
+
 
 (deftest find-class.1
   (loop for name in *cl-types-that-are-classes-symbols*
diff --git a/objects/find-method.lsp b/objects/find-method.lsp
index 72f1a75de669df6cb0a87b68cc461005b1e18403..41abcf010253caa5c997355cf46f6ad63d982a36 100644
--- a/objects/find-method.lsp
+++ b/objects/find-method.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jun  3 21:12:03 2003
 ;;;; Contains: Tests for FIND-METHOD
 
-(in-package :cl-test)
+
 
 (eval-when (:load-toplevel :compile-toplevel :execute)
   (report-and-ignore-errors
diff --git a/objects/load.lsp b/objects/load.lsp
index 80d52055d17d492d215b974885242dcbb31e4353..8c7692c5cc751f1abad44d0733a81211f0d33126 100644
--- a/objects/load.lsp
+++ b/objects/load.lsp
@@ -5,7 +5,11 @@
 
 (compile-and-load "ANSI-TESTS:AUX;defclass-aux.lsp")
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "defclass.lsp")
   (load "defclass-01.lsp")
   (load "defclass-02.lsp")
@@ -57,5 +61,4 @@
   (load "class-name.lsp")
   (load "class-of.lsp")
   (load "unbound-slot.lsp")
-  (load "defmethod.lsp")
-)
+  (load "defmethod.lsp"))
diff --git a/objects/make-instance.lsp b/objects/make-instance.lsp
index baa981c6e12c0c6458626c90238b1f0ab33b538e..e71e82ef706d9b932dbf46dab4f9aa4d15bec1fe 100644
--- a/objects/make-instance.lsp
+++ b/objects/make-instance.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon May 12 21:19:36 2003
 ;;;; Contains: Tests of MAKE-INSTANCE
 
-(in-package :cl-test)
+
 
 ;;; MAKE-INSTANCE is used in many other tests as well
 
diff --git a/objects/make-instances-obsolete.lsp b/objects/make-instances-obsolete.lsp
index 4cc14f04b93e0143bb757dcc5dbf1678a212e4c5..81d0e25f2efea8012b409f962c69f396d77b0010 100644
--- a/objects/make-instances-obsolete.lsp
+++ b/objects/make-instances-obsolete.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 17 08:12:35 2003
 ;;;; Contains: Tests of MAKE-INSTANCES-OBSOLETE
 
-(in-package :cl-test)
+
 
 (defclass make-instances-obsolete-class-01 ()
   ((a :initarg :a)
diff --git a/objects/make-load-form-saving-slots.lsp b/objects/make-load-form-saving-slots.lsp
index 8487f428e1cfaea809be588df2ad70d78bf69d22..008405a0dc5763192e879757fc3d230e44b8de32 100644
--- a/objects/make-load-form-saving-slots.lsp
+++ b/objects/make-load-form-saving-slots.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 17 11:54:54 2003
 ;;;; Contains: Tests of MAKE-LOAD-FORM-SAVING-SLOTS
 
-(in-package :cl-test)
+
 
 ;;; These are tests of MAKE-LOAD-FORM-SAVING-SLOTS proper; tests involving
 ;;; file compilation will be located elsewhere.
diff --git a/objects/make-load-form.lsp b/objects/make-load-form.lsp
index 22fb03cc6e5c71bf2d7fe7791e641c6bc47e6e65..a1c881ba73948d30d54704e3c161fb48e9e7df25 100644
--- a/objects/make-load-form.lsp
+++ b/objects/make-load-form.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 17 09:16:20 2003
 ;;;; Contains: Tests of MAKE-LOAD-FORM
 
-(in-package :cl-test)
+
 
 ;;; These tests are just of MAKE-LOAD-FORM itself; tests of file compilation
 ;;; that depend on MAKE-LOAD-FORM will be found elsewhere.
diff --git a/objects/method-qualifiers.lsp b/objects/method-qualifiers.lsp
index 0e3e2645953ead20f2a3cbfa4a57bc8840cb5985..dbe74880aae8ba879159fc2e2ccfb345a4fb48bd 100644
--- a/objects/method-qualifiers.lsp
+++ b/objects/method-qualifiers.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun May 11 07:14:12 2003
 ;;;; Contains: Tests of METHOD-QUALIFIERS
 
-(in-package :cl-test)
+
 
 (defgeneric mq-generic-function (x))
 
diff --git a/objects/next-method-p.lsp b/objects/next-method-p.lsp
index 1cbbda5f3edfb1d81681daabfea8df327ca39d5d..113d936c722c145f73fe5617153fda0cd26aaad9 100644
--- a/objects/next-method-p.lsp
+++ b/objects/next-method-p.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 31 08:04:45 2003
 ;;;; Contains: Tests of NEXT-METHOD-P
 
-(in-package :cl-test)
+
 
 (defgeneric nmp-gf-01 (x)
   (:method ((x integer)) (notnot-mv (next-method-p)))
diff --git a/objects/no-applicable-method.lsp b/objects/no-applicable-method.lsp
index 3f2f44abb7912449f3dac1429d269829c1ab6fe5..d0f09d8b2241aa952076d9d5335a88f340905a44 100644
--- a/objects/no-applicable-method.lsp
+++ b/objects/no-applicable-method.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun May 11 13:46:44 2003
 ;;;; Contains: Tests of NO-APPLICABLE-METHOD
 
-(in-package :cl-test)
+
 
 (defgeneric no-app-meth-gf-01 (x))
 
diff --git a/objects/no-next-method.lsp b/objects/no-next-method.lsp
index 86fe61ec30327150c3f9112e9a56bdefaa0c2f0b..a70098ff3cd1b51f8429bb6b997f79eb297440c5 100644
--- a/objects/no-next-method.lsp
+++ b/objects/no-next-method.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun May 11 14:41:50 2003
 ;;;; Contains: Tests of NO-NEXT-METHOD
 
-(in-package :cl-test)
+
 
 (defgeneric no-next-meth-gf-01 (x))
 
diff --git a/objects/reinitialize-instance.lsp b/objects/reinitialize-instance.lsp
index 952b034aabee0fad3b8f4cf8120d5602aedf2d47..6c486f78a0120cbf0eb5bb1d08c0f486754b533f 100644
--- a/objects/reinitialize-instance.lsp
+++ b/objects/reinitialize-instance.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Apr 28 21:56:47 2003
 ;;;; Contains: Tests for REINITIALIZE-INSTANCE
 
-(in-package :cl-test)
+
 
 ;;; Many of the classes used here are defined in defclass-??.lsp
 
diff --git a/objects/remove-method.lsp b/objects/remove-method.lsp
index 89b4812f28c6bf3d655f2a9af68dbb908e022388..5a7e31f0a6827e3f45f15df0f04d301059bc6d48 100644
--- a/objects/remove-method.lsp
+++ b/objects/remove-method.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun May 11 19:53:37 2003
 ;;;; Contains: Tests of REMOVE-METHOD
 
-(in-package :cl-test)
+
 
 (defparameter *remove-meth-gf-01*
   (defgeneric remove-meth-gf-01 (x)))
diff --git a/objects/shared-initialize.lsp b/objects/shared-initialize.lsp
index 34ffa8fcaf75e2068e54ee4ef6469bcc05bea81a..db16232dab18c60f054869b09e76a11c5cba4246 100644
--- a/objects/shared-initialize.lsp
+++ b/objects/shared-initialize.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Apr 29 04:09:06 2003
 ;;;; Contains: Tests of SHARED-INITIALIZE
 
-(in-package :cl-test)
+
 
 (defclass shared-init-class-01 ()
   ((a :initform 'x :initarg :a)
diff --git a/objects/slot-boundp.lsp b/objects/slot-boundp.lsp
index b6dfb9bfc11ba89f0c62430090df050566e68a0d..fd395099cdfebacdc036b32338f8cf7595cbfa04 100644
--- a/objects/slot-boundp.lsp
+++ b/objects/slot-boundp.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue May  6 05:53:32 2003
 ;;;; Contains: Tests of SLOT-BOUNDP
 
-(in-package :cl-test)
+
 
 ;;; SLOT-BOUNDP is extensively tested in other files as well
 
diff --git a/objects/slot-exists-p.lsp b/objects/slot-exists-p.lsp
index 08a36d718404ac1ba353b99f44a1c5d4bf3dedfb..e64d86a007a19cfe2428e5a71049eee44d8018bc 100644
--- a/objects/slot-exists-p.lsp
+++ b/objects/slot-exists-p.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 10 09:39:01 2003
 ;;;; Contains: Tests of SLOT-EXISTS-P
 
-(in-package :cl-test)
+
 
 ;;; This function is also tested incidentally in many other files
 
diff --git a/objects/slot-makunbound.lsp b/objects/slot-makunbound.lsp
index 9ba9b5414fea322726ab8f198cb5f02316689aa0..40cb38ad04d32267c1df3c8d0c671263e10468c5 100644
--- a/objects/slot-makunbound.lsp
+++ b/objects/slot-makunbound.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 10 14:39:01 2003
 ;;;; Contains: Tests for SLOT-MAKUNBOUND
 
-(in-package :cl-test)
+
 
 ;;; This function is heavily tested in other files as well
 
diff --git a/objects/slot-missing.lsp b/objects/slot-missing.lsp
index 65e7f4664670891597a688a143f7c3d45377a541..c78027718e98fc6aff5e28620adbc06cff2f3137 100644
--- a/objects/slot-missing.lsp
+++ b/objects/slot-missing.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jun 15 06:03:58 2003
 ;;;; Contains: Tests of SLOT-MISSING
 
-(in-package :cl-test)
+
 
 (defparameter *slot-missing-class-01-var* nil)
 
diff --git a/objects/slot-unbound.lsp b/objects/slot-unbound.lsp
index 657c57a9ce70adf34a6daea53d16bd85fdd1b67e..e7dcadc55935cda528b8d8175bdd70aefd58999b 100644
--- a/objects/slot-unbound.lsp
+++ b/objects/slot-unbound.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Jun 15 06:57:23 2003
 ;;;; Contains: Tests for SLOT-UNBOUND
 
-(in-package :cl-test)
+
 
 (defclass slot-unbound-class-01 ()
   ((a :reader sunb-a)
diff --git a/objects/slot-value.lsp b/objects/slot-value.lsp
index 001a25940b82df5ce7311a519f05e99470738572..13568dccc0d3c1315174351b1425d652fe5bee97 100644
--- a/objects/slot-value.lsp
+++ b/objects/slot-value.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 10 16:16:59 2003
 ;;;; Contains: Tests of SLOT-VALUE
 
-(in-package :cl-test)
+
 
 ;;; SLOT-VALUE is used extensively elsewhere.
 
diff --git a/objects/unbound-slot.lsp b/objects/unbound-slot.lsp
index 2da3af5ce082698942fcee07704ff40c4e06dbec..4d911592e6d9d04946faafac8cfacc3eb3fb0e9f 100644
--- a/objects/unbound-slot.lsp
+++ b/objects/unbound-slot.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Jun  4 20:14:26 2003
 ;;;; Contains: Tests for UNBOUND-SLOT, UNBOUND-SLOT-INSTANCE
 
-(in-package :cl-test)
+
 
 (defclass ubs-class-01 ()
   ((a :initarg :a)))
diff --git a/objects/update-instance-for-different-class.lsp b/objects/update-instance-for-different-class.lsp
index c8d4773d00fba87f8652caa97eca19b56778a695..58b1089521a759bb0480a7cf8a26f798f2637de4 100644
--- a/objects/update-instance-for-different-class.lsp
+++ b/objects/update-instance-for-different-class.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon May  5 19:32:56 2003
 ;;;; Contains: Tests for UPDATE-INSTANCE-FOR-DIFFERENT-CLASS
 
-(in-package :cl-test)
+
 
 (defclass uifdc-class-01a () ((a :initarg :a) (b :initarg :b)))
 (defclass uifdc-class-01b () (a b))
diff --git a/objects/with-accessors.lsp b/objects/with-accessors.lsp
index 3e8667b1ad649eff0e811f53989dfb7156d92378..858f5efef207926197797c03d56c88b8e7cd24c2 100644
--- a/objects/with-accessors.lsp
+++ b/objects/with-accessors.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 17 17:07:29 2003
 ;;;; Contains: Tests of WITH-ACCESSORS
 
-(in-package :cl-test)
+
 
 (deftest with-accessors.1
   (with-accessors () nil)
diff --git a/objects/with-slots.lsp b/objects/with-slots.lsp
index 455de611a4ecfa63f910fa3a260cdd5b760ba0d9..d86deab07e8d05a0019ca0748269843f914a3253 100644
--- a/objects/with-slots.lsp
+++ b/objects/with-slots.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat May 17 18:04:10 2003
 ;;;; Contains: Tests of WITH-SLOTS
 
-(in-package :cl-test)
+
 
 (deftest with-slots.1
   (with-slots () nil)
diff --git a/packages/defpackage.lsp b/packages/defpackage.lsp
index 6525bc2c6a73bcd129eb363c93be61cede647294..893a52edf0b93e0a5c26c3eb98f21ef7042f1513 100644
--- a/packages/defpackage.lsp
+++ b/packages/defpackage.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 25 08:09:18 1998
 ;;;; Contains: Tests of DEFPACKAGE
 
-(in-package :cl-test)
+
 
 
 
diff --git a/packages/delete-package.lsp b/packages/delete-package.lsp
index c153e76186fdfd52e2657743ddae4fb12c8ea972..0999067d130fabf08e0f25bab9a34dbbfe49192e 100644
--- a/packages/delete-package.lsp
+++ b/packages/delete-package.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 25 08:01:58 1998
 ;;;; Contains: Tests of DELETE-PACKAGE
 
-(in-package :cl-test)
+
 (declaim (optimize (safety 3)))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; delete-package
diff --git a/packages/do-all-symbols.lsp b/packages/do-all-symbols.lsp
index 869bc38b9b4ef266f8186b339049cde7e192c428..baa0c8e2ea204612fd0ac0ddec77b1cfd2919aea 100644
--- a/packages/do-all-symbols.lsp
+++ b/packages/do-all-symbols.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Feb 21 18:27:22 2004
 ;;;; Contains: Tests of DO-ALL-SYMBOLS
 
-(in-package :cl-test)
+
 
 (def-macro-test do-all-symbols.error.1
   (do-all-symbols (x)))
diff --git a/packages/do-external-symbols.lsp b/packages/do-external-symbols.lsp
index 16b827aa997f5467acef241d0dd279b12bceb9eb..af45442f71985be17cb8c3e23c240450ab52eb68 100644
--- a/packages/do-external-symbols.lsp
+++ b/packages/do-external-symbols.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Feb 21 18:26:08 2004
 ;;;; Contains: Tests of DO-EXTERNAL-SYMBOLS
 
-(in-package :cl-test)
+
 
 
 
diff --git a/packages/do-symbols.lsp b/packages/do-symbols.lsp
index 4cdb340ed4fecc3d6745fdc5cd08b94035182ce2..0b484d414117ab4204a498edf0c09057f553dfa4 100644
--- a/packages/do-symbols.lsp
+++ b/packages/do-symbols.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Feb 21 18:24:59 2004
 ;;;; Contains: Tests of DO-SYMBOLS
 
-(in-package :cl-test)
+
 
 
 
diff --git a/packages/export.lsp b/packages/export.lsp
index cfba7cfdb05c19027d2ddfea840f11469702fcee..12730af2b7c3930ce8d4421b0f2d2851723465c9 100644
--- a/packages/export.lsp
+++ b/packages/export.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 25 07:59:45 1998
 ;;;; Contains: Tests of EXPORT
 
-(in-package :cl-test)
+
 (declaim (optimize (safety 3)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/packages/find-all-symbols.lsp b/packages/find-all-symbols.lsp
index 2ee5e13681d09a3f41f5722ff8ed121ee2a43c58..07af26faa7c630d22b54933b3409cbd4d82ba204 100644
--- a/packages/find-all-symbols.lsp
+++ b/packages/find-all-symbols.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Feb 22 07:10:22 2004
 ;;;; Contains: Tests for FIND-ALL-SYMBOLS
 
-(in-package :cl-test)
+
 
 (deftest find-all-symbols.1
   (let ((all-packages (list-all-packages)))
diff --git a/packages/find-package.lsp b/packages/find-package.lsp
index fa44b0a3b630c08d17c57c9c7917b760bef71433..55cb4da48bc2a8d96456b4773c3bcb14d31fe0f0 100644
--- a/packages/find-package.lsp
+++ b/packages/find-package.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 25 07:50:39 1998
 ;;;; Contains: Tests for FIND-PACKAGE
 
-(in-package :cl-test)
+
 (declaim (optimize (safety 3)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/packages/find-symbol.lsp b/packages/find-symbol.lsp
index 303f51ea8001b00b43395a2a87ccd30e57258354..7aff94bae97a338aa6332c0c62de5c6b728a5c90 100644
--- a/packages/find-symbol.lsp
+++ b/packages/find-symbol.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 25 07:49:34 1998
 ;;;; Contains: Tests for FIND-SYMBOL
 
-(in-package :cl-test)
+
 
 ;;(declaim (optimize (safety 3)))
 
diff --git a/packages/import.lsp b/packages/import.lsp
index e430dc55624426344048c3565fcef86fb871f988..c0c03cc070c792ba1f415869dc7d54277ae83210 100644
--- a/packages/import.lsp
+++ b/packages/import.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Feb 19 07:06:48 2004
 ;;;; Contains: Tests of IMPORT
 
-(in-package :cl-test)
+
 
 
 
diff --git a/packages/in-package.lsp b/packages/in-package.lsp
index 3f80093d434f8391c26da9acd7eaaa6bde9823ef..67b9c467616ba47b76c8851030086e8aa9a36f57 100644
--- a/packages/in-package.lsp
+++ b/packages/in-package.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 25 08:06:03 1998
 ;;;; Contains: Tests of IN-PACKAGE
 
-(in-package :cl-test)
+
 (declaim (optimize (safety 3)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -55,7 +55,7 @@
   package-error)
 
 (def-macro-test in-package.error.1
-  (in-package :cl-test))
+    (in-package :cl-test))
 
 (defmacro def-in-package-test (test-name name-form)
   `(deftest ,test-name
diff --git a/packages/intern.lsp b/packages/intern.lsp
index dd85da9afd0594fb7cdb1191d0d315f0c949707c..930307e0e45e1e8fec0f69a4ce4a9b864b970de2 100644
--- a/packages/intern.lsp
+++ b/packages/intern.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 25 07:59:10 1998
 ;;;; Contains: Tests of INTERN
 
-(in-package :cl-test)
+
 (declaim (optimize (safety 3)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/packages/keyword.lsp b/packages/keyword.lsp
index cbc23ab6efec0e6119f207ee7036e5e1f7b32320..38c503fda6a3b16e225923d29e130af289e7542f 100644
--- a/packages/keyword.lsp
+++ b/packages/keyword.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Feb 22 06:53:55 2004
 ;;;; Contains: Tests of the KEYWORD package
 
-(in-package :cl-test)
+
 
 ;; Check that each keyword satisfies keywordp
 
diff --git a/packages/list-all-packages.lsp b/packages/list-all-packages.lsp
index 2eb8ca8fa9e3112604ec73d105e3392e217c1389..3b9a07abee3bb25d7f141e09fc029902b6369c9c 100644
--- a/packages/list-all-packages.lsp
+++ b/packages/list-all-packages.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Feb 21 17:47:37 2004
 ;;;; Contains: Tests of LIST-ALL-PACKAGES
 
-(in-package :cl-test)
+
 (declaim (optimize (safety 3)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/packages/load.lsp b/packages/load.lsp
index 568a0fab793f51c3f4865f7188cba06afafe4f97..9245c97da285d42e9f9c1408f285efa1750ed02e 100644
--- a/packages/load.lsp
+++ b/packages/load.lsp
@@ -6,7 +6,11 @@
 (compile-and-load "ANSI-TESTS:AUX;packages00-aux.lsp")
 (compile-and-load "ANSI-TESTS:AUX;package-aux.lsp")
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "find-symbol.lsp")
   (load "find-all-symbols.lsp")
   (load "find-package.lsp")
diff --git a/packages/make-package.lsp b/packages/make-package.lsp
index a5234a0dc81163150a81cf4e614673139f03e64a..da51bda58d7751ee328100a3d52b7f05b77d49b8 100644
--- a/packages/make-package.lsp
+++ b/packages/make-package.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 25 08:02:43 1998
 ;;;; Contains: Tests of MAKE-PACKAGE
 
-(in-package :cl-test)
+
 (declaim (optimize (safety 3)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/packages/package-error-package.lsp b/packages/package-error-package.lsp
index 1ceb58d28ade289f2c1aabc9e7e5da5a8f0e3f5f..8c9a1acfd1fe38f6371ea18e0b76a7b40c68fed9 100644
--- a/packages/package-error-package.lsp
+++ b/packages/package-error-package.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Feb 22 06:52:56 2004
 ;;;; Contains: Tests of PACKAGE-ERROR-PACKAGE
 
-(in-package :cl-test)
+
 
 (deftest package-error-package.1
   (eqt (find-package (package-error-package
diff --git a/packages/package-error.lsp b/packages/package-error.lsp
index 864c47735ff2af6b996c734c2022dafef46f22f5..a364c1b94cf56174e8277780868cbd54302bc99e 100644
--- a/packages/package-error.lsp
+++ b/packages/package-error.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Feb 22 06:52:21 2004
 ;;;; Contains: Tests of the condition PACKAGE-ERROR
 
-(in-package :cl-test)
+
 
 (deftest package-error.1
   (not
diff --git a/packages/package-name.lsp b/packages/package-name.lsp
index 4bdde92a51c058cf106893ff996a3d3a414300ae..fd486e35c5036128a7c37952c5df0507f617609f 100644
--- a/packages/package-name.lsp
+++ b/packages/package-name.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Feb 21 17:48:05 2004
 ;;;; Contains: Tests of PACKAGE-NAME
 
-(in-package :cl-test)
+
 (declaim (optimize (safety 3)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/packages/package-nicknames.lsp b/packages/package-nicknames.lsp
index 992d5a761d6e2a43ec049db81607bc112c58d4b8..f951162d0e50f1d43bf27813ca756f214825659a 100644
--- a/packages/package-nicknames.lsp
+++ b/packages/package-nicknames.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 25 07:51:26 1998
 ;;;; Contains: Tests of PACKAGE-NICKNAMES
 
-(in-package :cl-test)
+
 (declaim (optimize (safety 3)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/packages/package-shadowing-symbols.lsp b/packages/package-shadowing-symbols.lsp
index 2445b89beae5c61f4fac0fb063e3eea8aa10c4b4..df62396c2bf0b75d16fce03f1916c64673976ded 100644
--- a/packages/package-shadowing-symbols.lsp
+++ b/packages/package-shadowing-symbols.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Feb 22 06:55:17 2004
 ;;;; Contains: Tests of PACKAGE-SHADOWING-SYMBOLS
 
-(in-package :cl-test)
+
 
 ;;; Most tests of this function are in files for other package-related operators
 
diff --git a/packages/package-use-list.lsp b/packages/package-use-list.lsp
index 5a6ec89cd73beb1daa1871c6baa0937c082d54f0..e77f92f9a1781866b23dd68f621a18f1c1f79aa1 100644
--- a/packages/package-use-list.lsp
+++ b/packages/package-use-list.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Feb 22 06:55:56 2004
 ;;;; Contains: Tests of PACKAGE-USE-LIST
 
-(in-package :cl-test)
+
 
 ;;; Most tests of this function are in files for other package-related operators
 
diff --git a/packages/package-used-by-list.lsp b/packages/package-used-by-list.lsp
index 4bd5ba7a9cee5dbdbadf4f7eaa2f3bc9634130e0..26f27b196ae4b362ea925a74d4bf1158b2d5ad0d 100644
--- a/packages/package-used-by-list.lsp
+++ b/packages/package-used-by-list.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Feb 22 06:56:28 2004
 ;;;; Contains: Tests of PACKAGE-USED-BY-LIST
 
-(in-package :cl-test)
+
 
 ;;; Most tests of this function are in files for other package-related operators
 
diff --git a/packages/packagep.lsp b/packages/packagep.lsp
index 94290b1628e684ee77125504bd6c5b4a263663b4..7fa6487de938de552690863e7cdcdbb76886c1e6 100644
--- a/packages/packagep.lsp
+++ b/packages/packagep.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Feb 22 06:51:38 2004
 ;;;; Contains: Tests of PACKAGEP
 
-(in-package :cl-test)
+
 
 (deftest packagep.1
   (check-type-predicate #'packagep 'package)
diff --git a/packages/rename-package.lsp b/packages/rename-package.lsp
index f48fe8d4410f250e1680ddd38767a741efaea5e9..982e86dd9b6106f00c057cc743d1d6d8f279b760 100644
--- a/packages/rename-package.lsp
+++ b/packages/rename-package.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 25 08:00:28 1998
 ;;;; Contains: Tests of RENAME-PACKAGE
 
-(in-package :cl-test)
+
 (declaim (optimize (safety 3)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/packages/shadow.lsp b/packages/shadow.lsp
index 5269b5c3c6ce845ea171c836abaaee5ce4320356..6392b93f9b1a4a12bd0021f78f04e45d1388ffb8 100644
--- a/packages/shadow.lsp
+++ b/packages/shadow.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 25 08:01:20 1998
 ;;;; Contains: Tests of SHADOW
 
-(in-package :cl-test)
+
 (declaim (optimize (safety 3)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/packages/shadowing-import.lsp b/packages/shadowing-import.lsp
index c3963d506678ac89aec45af0c057145d9a5070b0..4e10d4e11b620f3fa82c268d03c2f0adb64b705c 100644
--- a/packages/shadowing-import.lsp
+++ b/packages/shadowing-import.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Aug 29 07:42:18 2004
 ;;;; Contains: Tests for SHADOWING-IMPORT
 
-(in-package :cl-test)
+
 
 (deftest shadowing-import.1
   (let ((name1 "TEST1")
diff --git a/packages/unexport.lsp b/packages/unexport.lsp
index d8d7ae50d4673be1b2161b0f342266b10dd0f989..4b7408906ac2e9d7f7ef9349fe2e42999ee2816b 100644
--- a/packages/unexport.lsp
+++ b/packages/unexport.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 25 08:04:19 1998
 ;;;; Contains: Tests of UNEXPORT
 
-(in-package :cl-test)
+
 (declaim (optimize (safety 3)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/packages/unintern.lsp b/packages/unintern.lsp
index e6f2f34101a5aacf89a5711fcaff5637588d2b0b..7dd37c24df43da6b89163ab3cf0732e9e726bbf8 100644
--- a/packages/unintern.lsp
+++ b/packages/unintern.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 25 08:04:56 1998
 ;;;; Contains: Tests of UNINTERN
 
-(in-package :cl-test)
+
 (declaim (optimize (safety 3)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/packages/unuse-package.lsp b/packages/unuse-package.lsp
index b0b0bb1c6931851e775fa7650e53c218b22e0bc6..3c4c2fdc8d8dc6c725e6d36ee9cb33ec3e077165 100644
--- a/packages/unuse-package.lsp
+++ b/packages/unuse-package.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 25 08:06:48 1998
 ;;;; Contains: Tests of UNUSE-PACKAGE
 
-(in-package :cl-test)
+
 
 
 
diff --git a/packages/use-package.lsp b/packages/use-package.lsp
index 09f47da4460fa3e65847bc686e128ac154a2eaad..95be7398c7bb55d6e1cd3aab279da1b6f114b555 100644
--- a/packages/use-package.lsp
+++ b/packages/use-package.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 25 08:08:41 1998
 ;;;; Contains: Tests of USE-PACKAGE
 
-(in-package :cl-test)
+
 
 
 
diff --git a/packages/with-package-iterator.lsp b/packages/with-package-iterator.lsp
index 514667e1afa7cc13cd82480f1aba17773772313c..6ec1905b7718598a81277c40a300664e035d74c8 100644
--- a/packages/with-package-iterator.lsp
+++ b/packages/with-package-iterator.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Apr 25 08:03:36 1998
 ;;;; Contains: Tests of WITH-PACKAGE-ITERATOR
 
-(in-package :cl-test)
+
 (declaim (optimize (safety 3)))
 
 
diff --git a/pathnames/directory-namestring.lsp b/pathnames/directory-namestring.lsp
index de40317766333e1c9500a03cce02f11e91042cc5..f14e5300aa619abbf79d213c3de33a7520fc00ee 100644
--- a/pathnames/directory-namestring.lsp
+++ b/pathnames/directory-namestring.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Sep 12 06:21:42 2004
 ;;;; Contains: Tests for DIRECTORY-NAMESTRING
 
-(in-package :cl-test)
+
 
 (deftest directory-namestring.1
   (let* ((vals (multiple-value-list
diff --git a/pathnames/enough-namestring.lsp b/pathnames/enough-namestring.lsp
index 885b1dcb988eb03fc128a84402cbe49d911400f7..f40155268bfa76c805e6f52ab4912121c0aaea3b 100644
--- a/pathnames/enough-namestring.lsp
+++ b/pathnames/enough-namestring.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Sep 12 06:23:50 2004
 ;;;; Contains: Tests of ENOUGH-NAMESTRING
 
-(in-package :cl-test)
+
 
 (deftest enough-namestring.1
   (let* ((vals (multiple-value-list (enough-namestring "enough-namestring.lsp")))
diff --git a/pathnames/file-namestring.lsp b/pathnames/file-namestring.lsp
index cc68ecac679784e0b822a548dcce43f15405143f..5a1051ba86f19658a58e8015a947ba8e70d8d2f0 100644
--- a/pathnames/file-namestring.lsp
+++ b/pathnames/file-namestring.lsp
@@ -3,8 +3,6 @@
 ;;;; Created:  Sat Sep 11 07:40:47 2004
 ;;;; Contains: Tests for FILE-NAMESTRING
 
-(in-package :cl-test)
-
 (deftest file-namestring.1
   (let* ((vals (multiple-value-list
                 (file-namestring "file-namestring.lsp")))
diff --git a/pathnames/host-namestring.lsp b/pathnames/host-namestring.lsp
index 221a01ae2fb6512addb0d2fc840842eb6357b567..cb50b66984c6fd65be4dcd303586321affaee079 100644
--- a/pathnames/host-namestring.lsp
+++ b/pathnames/host-namestring.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Sep 12 06:22:40 2004
 ;;;; Contains: Tests of HOST-NAMESTRING
 
-(in-package :cl-test)
+
 
 (deftest host-namestring.1
   (let* ((vals (multiple-value-list
diff --git a/pathnames/load-logical-pathname-translations.lsp b/pathnames/load-logical-pathname-translations.lsp
index 8c45dfde7c3b2f80c2942a472678b7709155989c..29f26518d406faebd37ddbed52b0afb7570431ea 100644
--- a/pathnames/load-logical-pathname-translations.lsp
+++ b/pathnames/load-logical-pathname-translations.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Dec 31 09:31:33 2003
 ;;;; Contains: Tests (such as they are) for LOAD-LOGICAL-PATHNAME-TRANSLATIONS
 
-(in-package :cl-test)
+
 
 ;;; The function LOAD-LOGICAL-PATHNAME-TRANSLATIONS is almost entirely
 ;;; untestable, since the basic behavior is implementation defined.
diff --git a/pathnames/load.lsp b/pathnames/load.lsp
index c0e1c50d307406c5e4523575c313465170d30134..0bd8aa8c1bfe62ba97a8c545b7c71755206ef2c5 100644
--- a/pathnames/load.lsp
+++ b/pathnames/load.lsp
@@ -1,7 +1,11 @@
 ;;;; Tests for pathnames and logical pathnames
 (compile-and-load "ANSI-TESTS:AUX;pathnames-aux.lsp")
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "pathnames.lsp")
   (load "pathname.lsp")
   (load "pathnamep.lsp")
@@ -28,5 +32,4 @@
   (load "merge-pathnames.lsp")
   (load "pathname-match-p.lsp")
 
-  (load "parse-namestring.lsp")
-)
+  (load "parse-namestring.lsp"))
diff --git a/pathnames/logical-pathname-translations.lsp b/pathnames/logical-pathname-translations.lsp
index b03718e62f19322bbce63bcb40e40c2ddb53ec09..1da2bdcd849976efa9ebde8fc075be2a6b5ea3c5 100644
--- a/pathnames/logical-pathname-translations.lsp
+++ b/pathnames/logical-pathname-translations.lsp
@@ -3,6 +3,6 @@
 ;;;; Created:  Wed Dec 31 09:46:08 2003
 ;;;; Contains: Tests of LOGICAL-PATHNAME-TRANSLATIONS
 
-(in-package :cl-test)
+
 
 
diff --git a/pathnames/logical-pathname.lsp b/pathnames/logical-pathname.lsp
index 4eed837d63a086be8ef8f8b766bc3f2478a26a7a..c5ae6e65670de9f8bbfffabcbacc623e121f90a3 100644
--- a/pathnames/logical-pathname.lsp
+++ b/pathnames/logical-pathname.lsp
@@ -3,8 +3,6 @@
 ;;;; Created:  Tue Dec 30 19:05:01 2003
 ;;;; Contains: Tests of LOGICAL-PATHNAME
 
-(in-package :cl-test)
-
 (deftest logical-pathname.1
   (loop for x in *logical-pathnames*
         always (eql x (logical-pathname x)))
diff --git a/pathnames/make-pathname.lsp b/pathnames/make-pathname.lsp
index 1e6c70571ea19fe23eacc4d26f46278783bfff80..82f362bb5a6aae755e132c4af0abf93028ba0abb 100644
--- a/pathnames/make-pathname.lsp
+++ b/pathnames/make-pathname.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Nov 29 05:54:30 2003
 ;;;; Contains: Tests of MAKE-PATHNAME
 
-(in-package :cl-test)
+
 
 (defvar *null-pathname*
     (make-pathname))
diff --git a/pathnames/merge-pathnames.lsp b/pathnames/merge-pathnames.lsp
index 0a5c94df64b044b452dbce525db9110e73dbaa05..35d9eb2e456106b3c26296370c42f6be4f7f1a2f 100644
--- a/pathnames/merge-pathnames.lsp
+++ b/pathnames/merge-pathnames.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Dec 31 11:25:55 2003
 ;;;; Contains: Tests of MERGE-PATHNAMES
 
-(in-package :cl-test)
+
 
 #|
 (defun merge-pathnames-test (&rest args)
diff --git a/pathnames/namestring.lsp b/pathnames/namestring.lsp
index dee99ab6ff1534e5e4d10d50accfe384d99caf26..ef1bffe714160e19edaa18df7713fb21d41fc97a 100644
--- a/pathnames/namestring.lsp
+++ b/pathnames/namestring.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Sep  2 07:24:42 2004
 ;;;; Contains: Tests for NAMESTRING
 
-(in-package :cl-test)
+
 
 (deftest namestring.1
   (let* ((vals (multiple-value-list (namestring "namestring.lsp")))
diff --git a/pathnames/parse-namestring.lsp b/pathnames/parse-namestring.lsp
index efbf6fc438d47dffb7dedc5547df8df421fb0c09..496527d3c15b0417faac3d1e786afc70009db183 100644
--- a/pathnames/parse-namestring.lsp
+++ b/pathnames/parse-namestring.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Aug 14 13:59:18 2004
 ;;;; Contains: Tests of PARSE-NAMESTRING
 
-(in-package :cl-test)
+
 
 ;;; "Parsing a null string always succeeds, producing a pathname
 ;;;  with all components (except the host) equal to nil."
diff --git a/pathnames/pathname-device.lsp b/pathnames/pathname-device.lsp
index 621719b64f2da4e1763f6326a96c98f1a3569d65..0082ba888ca81f558bcdb8dc0774da8ba787516e 100644
--- a/pathnames/pathname-device.lsp
+++ b/pathnames/pathname-device.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Dec  6 14:23:54 2003
 ;;;; Contains: Tests for PATHNAME-DEVICE
 
-(in-package :cl-test)
+
 
 
 
diff --git a/pathnames/pathname-directory.lsp b/pathnames/pathname-directory.lsp
index 694d796681699ba5691e6fdfbc4fdfb6ac95c54a..6e5a772ef09e9c5a5902d71315780c3154213121 100644
--- a/pathnames/pathname-directory.lsp
+++ b/pathnames/pathname-directory.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Dec  6 14:24:39 2003
 ;;;; Contains: Tests for PATHNAME-DIRECTORY
 
-(in-package :cl-test)
+
 
 
 
diff --git a/pathnames/pathname-host.lsp b/pathnames/pathname-host.lsp
index a347376655112e95d280ce194528938efd63d778..c47df27035d7a7d6fef3e6c66dca67f190305857 100644
--- a/pathnames/pathname-host.lsp
+++ b/pathnames/pathname-host.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Dec  6 14:23:22 2003
 ;;;; Contains: Tests for PATHNAME-HOST
 
-(in-package :cl-test)
+
 
 
 
diff --git a/pathnames/pathname-match-p.lsp b/pathnames/pathname-match-p.lsp
index 2df133a2b1d0f039ae11dd830adf3f7d043cee54..da491448285c4ed08d0b9a847631d036376a3250 100644
--- a/pathnames/pathname-match-p.lsp
+++ b/pathnames/pathname-match-p.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Aug 15 07:46:22 2004
 ;;;; Contains: Tests for PATHNAME-MATCH-P
 
-(in-package :cl-test)
+
 
 
 
diff --git a/pathnames/pathname-name.lsp b/pathnames/pathname-name.lsp
index 2ce7d1ebb92df7f4b0fea96b8ac636809557dce3..db53400343cb216aeb7b74f4d516ffe9cc7416f8 100644
--- a/pathnames/pathname-name.lsp
+++ b/pathnames/pathname-name.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Dec  6 14:45:16 2003
 ;;;; Contains: Tests for PATHNAME-NAME
 
-(in-package :cl-test)
+
 
 
 
diff --git a/pathnames/pathname-type.lsp b/pathnames/pathname-type.lsp
index b08766aa5c847481198477e8d4aac26292492f1b..2c23bbb1774ec80903d9cf99fccf718bc31c3958 100644
--- a/pathnames/pathname-type.lsp
+++ b/pathnames/pathname-type.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Dec  6 14:45:16 2003
 ;;;; Contains: Tests for PATHNAME-TYPE
 
-(in-package :cl-test)
+
 
 
 
diff --git a/pathnames/pathname-version.lsp b/pathnames/pathname-version.lsp
index 3dc83b1f0fe5945216b236d70f86bb1c2eed17f1..25b89e435f2c3998051f937100b532b5beb5201c 100644
--- a/pathnames/pathname-version.lsp
+++ b/pathnames/pathname-version.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Dec  6 14:45:16 2003
 ;;;; Contains: Tests for PATHNAME-VERSION
 
-(in-package :cl-test)
+
 
 
 
diff --git a/pathnames/pathname.lsp b/pathnames/pathname.lsp
index 51ecc01478e1e9738f03948beddfe0878670f51b..13250a20b01d9e6be9c91759634550f18480c60f 100644
--- a/pathnames/pathname.lsp
+++ b/pathnames/pathname.lsp
@@ -3,7 +3,6 @@
 ;;;; Created:  Sat Nov 29 05:06:57 2003
 ;;;; Contains: Tests of the function PATHNAME
 
-(in-package :cl-test)
 
 (deftest pathname.1
   (loop for x in *pathnames*
@@ -11,19 +10,19 @@
   t)
 
 (deftest pathname.2
-  (equalt #p"ansi-aux.lsp" (pathname "ansi-aux.lsp"))
+  (equalt #p"pathname.lsp" (pathname "pathname.lsp"))
   t)
 
 (deftest pathname.3
-  (let ((s (open "ansi-aux.lsp" :direction :input)))
-    (prog1 (equalt (truename (pathname s)) (truename #p"ansi-aux.lsp"))
+  (let ((s (open "pathname.lsp" :direction :input)))
+    (prog1 (equalt (truename (pathname s)) (truename #p"pathname.lsp"))
       (close s)))
   t)
 
 (deftest pathname.4
-  (let ((s (open "ansi-aux.lsp" :direction :input)))
+  (let ((s (open "pathname.lsp" :direction :input)))
     (close s)
-    (equalt (truename (pathname s)) (truename #p"ansi-aux.lsp")))
+    (equalt (truename (pathname s)) (truename #p"pathname.lsp")))
   t)
 
 (deftest pathname.5
@@ -32,35 +31,35 @@
   t)
 
 (deftest pathname.6
-  (equalt #p"ansi-aux.lsp"
-          (pathname (make-array 12 :initial-contents "ansi-aux.lsp"
+  (equalt #p"pathname.lsp"
+          (pathname (make-array 12 :initial-contents "pathname.lsp"
                                 :element-type 'base-char)))
   t)
 
 (deftest pathname.7
-  (equalt #p"ansi-aux.lsp"
-          (pathname (make-array 15 :initial-contents "ansi-aux.lspXXX"
+  (equalt #p"pathname.lsp"
+          (pathname (make-array 15 :initial-contents "pathname.lspXXX"
                                 :element-type 'base-char
                                 :fill-pointer 12)))
   t)
 
 (deftest pathname.8
-  (equalt #p"ansi-aux.lsp"
-          (pathname (make-array 12 :initial-contents "ansi-aux.lsp"
+  (equalt #p"pathname.lsp"
+          (pathname (make-array 12 :initial-contents "pathname.lsp"
                                 :element-type 'base-char
                                 :adjustable t)))
   t)
 
 (deftest pathname.9
-  (equalt #p"ansi-aux.lsp"
-          (pathname (make-array 15 :initial-contents "ansi-aux.lspXXX"
+  (equalt #p"pathname.lsp"
+          (pathname (make-array 15 :initial-contents "pathname.lspXXX"
                                 :element-type 'character
                                 :fill-pointer 12)))
   t)
 
 (deftest pathname.10
-  (equalt #p"ansi-aux.lsp"
-          (pathname (make-array 12 :initial-contents "ansi-aux.lsp"
+  (equalt #p"pathname.lsp"
+          (pathname (make-array 12 :initial-contents "pathname.lsp"
                                 :element-type 'character
                                 :adjustable t)))
   t)
@@ -68,9 +67,9 @@
 (deftest pathname.11
   (loop for etype in '(standard-char base-char character)
         collect
-        (equalt #p"ansi-aux.lsp"
+        (equalt #p"pathname.lsp"
                 (pathname
-                 (let* ((s (make-array 15 :initial-contents "XXansi-aux.lspX"
+                 (let* ((s (make-array 15 :initial-contents "XXpathname.lspX"
                                        :element-type etype)))
                    (make-array 12 :element-type etype
                                :displaced-to s
diff --git a/pathnames/pathnamep.lsp b/pathnames/pathnamep.lsp
index 15d8a2fb29f26d5d68abc06b4a5d602dda1f2061..d985cad047e7247735a0f500d3711bbd6967356a 100644
--- a/pathnames/pathnamep.lsp
+++ b/pathnames/pathnamep.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Dec  6 10:26:45 2003
 ;;;; Contains: Tests of PATHNAMEP
 
-(in-package :cl-test)
+
 
 (deftest pathnamep.1
   (check-type-predicate #'pathnamep 'pathname)
diff --git a/pathnames/pathnames.lsp b/pathnames/pathnames.lsp
index 98c671a8271b1c675d58692a5c42ad84544b8604..b25bb3b092bfa2065f9da20ba4729490f493e748 100644
--- a/pathnames/pathnames.lsp
+++ b/pathnames/pathnames.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Nov 29 04:21:53 2003
 ;;;; Contains: Various tests on pathnames
 
-(in-package :cl-test)
+
 
 (deftest pathnames-print-and-read-properly
   (with-standard-io-syntax
diff --git a/pathnames/translate-logical-pathname.lsp b/pathnames/translate-logical-pathname.lsp
index f8bc3998b82055982644c57795c020845124478a..8e7b2942e6024476ff9b5cab7182d34cdbf7832c 100644
--- a/pathnames/translate-logical-pathname.lsp
+++ b/pathnames/translate-logical-pathname.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Dec 29 14:45:50 2003
 ;;;; Contains: Tests for TRANSLATE-LOGICAL-PATHNAME
 
-(in-package :cl-test)
+
 
 ;; On physical pathnames, t-l-p returns the pathname itself
 
diff --git a/pathnames/wild-pathname-p.lsp b/pathnames/wild-pathname-p.lsp
index 72a4228cd9a3d08eb54c2d27797d00a62137b1f3..47300a052dcec666af316116a96308d000dce2bd 100644
--- a/pathnames/wild-pathname-p.lsp
+++ b/pathnames/wild-pathname-p.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Dec 31 16:54:55 2003
 ;;;; Contains: Tests of WILD-PATHNAME-P
 
-(in-package :cl-test)
+
 
 
 
diff --git a/printer/copy-pprint-dispatch.lsp b/printer/copy-pprint-dispatch.lsp
index bde35df046791ecc1cc11dd0495832613821e591..74f10db841718a2f980bfaef29e4ad8144a1ba91 100644
--- a/printer/copy-pprint-dispatch.lsp
+++ b/printer/copy-pprint-dispatch.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Feb 23 04:41:29 2004
 ;;;; Contains: Tests of COPY-PPRINT-DISPATCH
 
-(in-package :cl-test)
+
 
 (deftest copy-pprint-dispatch.1
   (with-standard-io-syntax
diff --git a/format/format-a.lsp b/printer/format/format-a.lsp
similarity index 99%
rename from format/format-a.lsp
rename to printer/format/format-a.lsp
index 5c0b44cd9300949620c74ad2ba09e50802d055c4..42a2022064109e838fc89e6ff42ef4a0e3d679db 100644
--- a/format/format-a.lsp
+++ b/printer/format/format-a.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Mon Aug  2 01:42:35 2004
 ;;;; Contains: Tests of printing using the ~A directive
 
-(in-package :cl-test)
+
 
 
 (def-format-test format.a.1
diff --git a/format/format-ampersand.lsp b/printer/format/format-ampersand.lsp
similarity index 99%
rename from format/format-ampersand.lsp
rename to printer/format/format-ampersand.lsp
index 44583472cccfa2dd4f542bce5e593ee95276d26b..be520b9f05befca0ff23d005e56600afca8a9a5a 100644
--- a/format/format-ampersand.lsp
+++ b/printer/format/format-ampersand.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jul 27 23:52:20 2004
 ;;;; Contains: Tests of format with ~& directive
 
-(in-package :cl-test)
+
 
 
 (def-format-test format.&.1
diff --git a/format/format-b.lsp b/printer/format/format-b.lsp
similarity index 99%
rename from format/format-b.lsp
rename to printer/format/format-b.lsp
index dafc51d521a23c113caec8b3ba3c59277d716bf9..112681e131216df21dff12c4638f6f4e09ac5f4b 100644
--- a/format/format-b.lsp
+++ b/printer/format/format-b.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Aug  1 05:10:10 2004
 ;;;; Contains: Tests of the ~B format directive
 
-(in-package :cl-test)
+
 
 
 
diff --git a/format/format-brace.lsp b/printer/format/format-brace.lsp
similarity index 99%
rename from format/format-brace.lsp
rename to printer/format/format-brace.lsp
index 8f5aafb295785ee2e0fc7274e472dd2818a35548..1a86accc53ebe4522166c352eb396479ef5066a1 100644
--- a/format/format-brace.lsp
+++ b/printer/format/format-brace.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Aug 25 22:08:51 2004
 ;;;; Contains: Tests of the ~"{ ... ~} format directives
 
-(in-package :cl-test)
+
 
 
 
diff --git a/format/format-c.lsp b/printer/format/format-c.lsp
similarity index 99%
rename from format/format-c.lsp
rename to printer/format/format-c.lsp
index dec2937a8453b38347dc3504b8b3d1791a32c23e..4d2a8ccd794c9fe5f59840b01b33af7b2acd8b74 100644
--- a/format/format-c.lsp
+++ b/printer/format/format-c.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jul 27 23:07:16 2004
 ;;;; Contains: Tests of formatted output, ~C directive
 
-(in-package :cl-test)
+
 
 
 
diff --git a/format/format-circumflex.lsp b/printer/format/format-circumflex.lsp
similarity index 99%
rename from format/format-circumflex.lsp
rename to printer/format/format-circumflex.lsp
index c028c3d80d0e0b78493ed4da46c7ee7ee12acf8b..00bd625928055c84ac66d1d4ee154d38db071ac4 100644
--- a/format/format-circumflex.lsp
+++ b/printer/format/format-circumflex.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Nov 11 20:17:51 2004
 ;;;; Contains: Tests of the ~^ format directive (inside other format constructs)
 
-(in-package :cl-test)
+
 
 
 ;;; Tests of ~^ inside ~{ ... ~}
diff --git a/format/format-conditional.lsp b/printer/format/format-conditional.lsp
similarity index 99%
rename from format/format-conditional.lsp
rename to printer/format/format-conditional.lsp
index 8b2c955b4fe160a82a097979c16757d8886bb93b..49e57b2ac539e4441c511cbf2d38a2f9234091f6 100644
--- a/format/format-conditional.lsp
+++ b/printer/format/format-conditional.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Aug 25 19:27:25 2004
 ;;;; Contains: Tests of the ~[ ~] forms
 
-(in-package :cl-test)
+
 
 
 
diff --git a/format/format-d.lsp b/printer/format/format-d.lsp
similarity index 99%
rename from format/format-d.lsp
rename to printer/format/format-d.lsp
index 8d065e4a28aa57e32ec20d9ff45dfc73e8b7dc2d..028f6920b501afa00bcd38ab2cdc71b179d7b5e8 100644
--- a/format/format-d.lsp
+++ b/printer/format/format-d.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Jul 31 05:19:39 2004
 ;;;; Contains: Tests of the ~D format directive
 
-(in-package :cl-test)
+
 
 
 
diff --git a/format/format-f.lsp b/printer/format/format-f.lsp
similarity index 99%
rename from format/format-f.lsp
rename to printer/format/format-f.lsp
index d35f5d4726b08ee1e8d1d0e7d145b3fa42d552d4..55c6fd6da9071fcea8aff95d601466794c89cc46 100644
--- a/format/format-f.lsp
+++ b/printer/format/format-f.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Aug  1 07:14:17 2004
 ;;;; Contains: Tests of the ~f format directive
 
-(in-package :cl-test)
+
 
 
 
diff --git a/format/format-goto.lsp b/printer/format/format-goto.lsp
similarity index 99%
rename from format/format-goto.lsp
rename to printer/format/format-goto.lsp
index 77f0a6f37be3086f17f194c60fa97022a3ff0f41..4397f7df0c4c101ae19712b131b9cb1ec2d71683 100644
--- a/format/format-goto.lsp
+++ b/printer/format/format-goto.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Aug 24 06:56:13 2004
 ;;;; Contains: Tests of the ~* format directive
 
-(in-package :cl-test)
+
 
 
 
diff --git a/format/format-i.lsp b/printer/format/format-i.lsp
similarity index 98%
rename from format/format-i.lsp
rename to printer/format/format-i.lsp
index acd375f388d5a21b893293ff0eb46a0dd36dca76..79b1f0e639eadb0fc10d6743f2d7652d735dcd9a 100644
--- a/format/format-i.lsp
+++ b/printer/format/format-i.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Aug 21 07:01:36 2004
 ;;;; Contains: Tests for the ~I format directive
 
-(in-package :cl-test)
+
 
 
 
diff --git a/format/format-justify.lsp b/printer/format/format-justify.lsp
similarity index 99%
rename from format/format-justify.lsp
rename to printer/format/format-justify.lsp
index cc388807007da2a76b7d216ad073fea3daaa020a..bcfd67a4b50fa8c45bf826bf8ec00c565d16988b 100644
--- a/format/format-justify.lsp
+++ b/printer/format/format-justify.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Aug 22 18:09:49 2004
 ;;;; Contains: Tests of the ~< ~> directive
 
-(in-package :cl-test)
+
 
 
 
diff --git a/format/format-logical-block.lsp b/printer/format/format-logical-block.lsp
similarity index 99%
rename from format/format-logical-block.lsp
rename to printer/format/format-logical-block.lsp
index fc13e0ec3154bdcdb996148908b79b132b5c3987..98155f114887214e9a6a5cafdf98eb946bf394b2 100644
--- a/format/format-logical-block.lsp
+++ b/printer/format/format-logical-block.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Aug  8 12:17:31 2004
 ;;;; Contains: Tests of the ~< ~:> format directives
 
-(in-package :cl-test)
+
 
 
 
diff --git a/format/format-newline.lsp b/printer/format/format-newline.lsp
similarity index 95%
rename from format/format-newline.lsp
rename to printer/format/format-newline.lsp
index 740d02c5f817fca9034077cb9d7d2c90deaef1d1..4bf8c7865b59acde3df0d59f452c448101fa1743 100644
--- a/format/format-newline.lsp
+++ b/printer/format/format-newline.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Nov 27 08:07:16 2004
 ;;;; Contains: Tests of ~<newline>
 
-(in-package :cl-test)
+
 
 
 (def-format-test format.newline.1
diff --git a/format/format-o.lsp b/printer/format/format-o.lsp
similarity index 99%
rename from format/format-o.lsp
rename to printer/format/format-o.lsp
index f2ec25af4e9ad600586cc6cc90e33f232be4b959..813d7f905a81031c58d9bdb7b9322d44b9fede36 100644
--- a/format/format-o.lsp
+++ b/printer/format/format-o.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Aug  1 06:36:30 2004
 ;;;; Contains: Tests of format directive ~O
 
-(in-package :cl-test)
+
 
 
 
diff --git a/format/format-p.lsp b/printer/format/format-p.lsp
similarity index 98%
rename from format/format-p.lsp
rename to printer/format/format-p.lsp
index 28bb2e8f4ccbd223b52ebe45416f605e5b54292f..43158eea3247b3a376e3126db1452a38e98f382a 100644
--- a/format/format-p.lsp
+++ b/printer/format/format-p.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Oct 17 21:32:45 2004
 ;;;; Contains: Tests of the ~P format directives
 
-(in-package :cl-test)
+
 
 
 
diff --git a/format/format-page.lsp b/printer/format/format-page.lsp
similarity index 98%
rename from format/format-page.lsp
rename to printer/format/format-page.lsp
index 147140b7f38ed41da3aadb14a8e07a574e67f351..1b96e21e7f1fde8772357ea270383938c86d89ad 100644
--- a/format/format-page.lsp
+++ b/printer/format/format-page.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Jul 28 00:20:46 2004
 ;;;; Contains: Tests of format with ~| directive
 
-(in-package :cl-test)
+
 
 
 (def-format-test format.page.1
diff --git a/format/format-paren.lsp b/printer/format/format-paren.lsp
similarity index 99%
rename from format/format-paren.lsp
rename to printer/format/format-paren.lsp
index d5c7dba28bf3fcb6e87615ad604b98f414be39cd..57fad106a882e5198b66cbb6c4b1d3680d0c126a 100644
--- a/format/format-paren.lsp
+++ b/printer/format/format-paren.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Oct 17 20:28:24 2004
 ;;;; Contains: Tests of the ~( format directives
 
-(in-package :cl-test)
+
 
 
 
diff --git a/format/format-percent.lsp b/printer/format/format-percent.lsp
similarity index 98%
rename from format/format-percent.lsp
rename to printer/format/format-percent.lsp
index 99d1a4386dab81652bc46c959e1296b1ac6af929..f99d62b10492fa8f481281dce7afbc3d89b19c30 100644
--- a/format/format-percent.lsp
+++ b/printer/format/format-percent.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Jul 27 23:47:44 2004
 ;;;; Contains: Tests of format with ~% directive
 
-(in-package :cl-test)
+
 
 
 (def-format-test format.%.1
diff --git a/format/format-question.lsp b/printer/format/format-question.lsp
similarity index 97%
rename from format/format-question.lsp
rename to printer/format/format-question.lsp
index 3b86a2ba388979c5c69b182a8b606fdc6a20a10d..476843ce277eff24551cb9b912158bbf6a754774 100644
--- a/format/format-question.lsp
+++ b/printer/format/format-question.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Oct 17 20:08:18 2004
 ;;;; Contains: Tests of the ~? and ~@? format directives
 
-(in-package :cl-test)
+
 
 
 
diff --git a/format/format-r.lsp b/printer/format/format-r.lsp
similarity index 99%
rename from format/format-r.lsp
rename to printer/format/format-r.lsp
index c9c1580b861e3c254b915d77f52f06b2f84ee7cd..32fcd170e927317253eeca8845890f266b56663a 100644
--- a/format/format-r.lsp
+++ b/printer/format/format-r.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Jul 28 00:33:02 2004
 ;;;; Contains: Tests of the format directive ~R
 
-(in-package :cl-test)
+
 
 ;;; Test of various radixes
 
diff --git a/format/format-s.lsp b/printer/format/format-s.lsp
similarity index 99%
rename from format/format-s.lsp
rename to printer/format/format-s.lsp
index cf820bbb4885744fe80fa68145353ac2a18a19e5..01f4c3839086291e1f4daa1a3fc4588b7a84dea9 100644
--- a/format/format-s.lsp
+++ b/printer/format/format-s.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Tue Aug  3 11:55:07 2004
 ;;;; Contains: Test of the ~S format directive
 
-(in-package :cl-test)
+
 
 
 (deftest format.s.1
diff --git a/format/format-slash.lsp b/printer/format/format-slash.lsp
similarity index 99%
rename from format/format-slash.lsp
rename to printer/format/format-slash.lsp
index b62715f60ceeca915a44c3dfa015288ef1cfc6f8..9365dbf9b5aa48ac0529ec130df742e999636ed8 100644
--- a/format/format-slash.lsp
+++ b/printer/format/format-slash.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Aug 21 09:51:08 2004
 ;;;; Contains: Tests for format directive ~/.../
 
-(in-package :cl-test)
+
 
 
 
diff --git a/format/format-t.lsp b/printer/format/format-t.lsp
similarity index 99%
rename from format/format-t.lsp
rename to printer/format/format-t.lsp
index 8b8927995165fe4b2c8b0c318572f1968e939590..d1ceb4d44a1311552b8122ff7feb5812794773ed 100644
--- a/format/format-t.lsp
+++ b/printer/format/format-t.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sat Aug 21 12:45:22 2004
 ;;;; Contains: Tests of the ~T format directive
 
-(in-package :cl-test)
+
 
 
 
diff --git a/format/format-tilde.lsp b/printer/format/format-tilde.lsp
similarity index 98%
rename from format/format-tilde.lsp
rename to printer/format/format-tilde.lsp
index b062f63a55045f054c672906a242da799415084d..16991a8a844e5bbf77ca3f4af8f4aa2238638662 100644
--- a/format/format-tilde.lsp
+++ b/printer/format/format-tilde.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Jul 28 00:27:00 2004
 ;;;; Contains: Tests of format directive ~~
 
-(in-package :cl-test)
+
 
 
 (def-format-test format.~.1
diff --git a/format/format-underscore.lsp b/printer/format/format-underscore.lsp
similarity index 99%
rename from format/format-underscore.lsp
rename to printer/format/format-underscore.lsp
index 2656b894a5e9a71932e726d4e8de7262c4a285f8..60ae6a2be3bfe82f199f6b66f1d2036a8bbd1ecc 100644
--- a/format/format-underscore.lsp
+++ b/printer/format/format-underscore.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Wed Aug  4 03:36:50 2004
 ;;;; Contains: Tests of the ~_ format directive
 
-(in-package :cl-test)
+
 
 
 
diff --git a/format/format-x.lsp b/printer/format/format-x.lsp
similarity index 99%
rename from format/format-x.lsp
rename to printer/format/format-x.lsp
index 5a45110dbba1a327474e20983dfcb776e01c76df..1db94b8c0c4bc134149390988c7cae6f777ae4b6 100644
--- a/format/format-x.lsp
+++ b/printer/format/format-x.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Aug  1 06:51:34 2004
 ;;;; Contains: Tests of ~X format directive
 
-(in-package :cl-test)
+
 
 
 
diff --git a/format/formatter-c.lsp b/printer/format/formatter-c.lsp
similarity index 99%
rename from format/formatter-c.lsp
rename to printer/format/formatter-c.lsp
index c61050da46fddda27e3ced07d906a5992d0c4be3..91c75b2da7a0b1c963686983564f822ae244c76b 100644
--- a/format/formatter-c.lsp
+++ b/printer/format/formatter-c.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Sun Dec  5 14:32:46 2004
 ;;;; Contains: Tests of FORMATTER on the C directive
 
-(in-package :cl-test)
+
 
 
 
diff --git a/format/load.lsp b/printer/format/load.lsp
similarity index 98%
rename from format/load.lsp
rename to printer/format/load.lsp
index 17a65bd2fb22d6f1f9c40c2967c1f920317d1d0d..8d9194979d49dec76fea3e72971865e8d5b067ef 100644
--- a/format/load.lsp
+++ b/printer/format/load.lsp
@@ -3,8 +3,6 @@
 ;;;; Created:  Mon Aug  2 21:47:02 2004
 ;;;; Contains: Load format-related tests
 
-(in-package :cl-test)
-
 ;;; Format tests
 
 ;;; 22.3.1
diff --git a/printer/format/load.lsp~ b/printer/format/load.lsp~
new file mode 100644
index 0000000000000000000000000000000000000000..c908a196490962bbdce135569bcd8ae21ef9b8bc
--- /dev/null
+++ b/printer/format/load.lsp~
@@ -0,0 +1,54 @@
+;-*- Mode:     Lisp -*-
+;;;; Author:   Paul Dietz
+;;;; Created:  Mon Aug  2 21:47:02 2004
+;;;; Contains: Load format-related tests
+
+
+
+;;; Format tests
+
+;;; 22.3.1
+(load "format/format-c.lsp")
+(load "format/formatter-c.lsp")
+(load "format/format-percent.lsp")
+(load "format/format-ampersand.lsp")
+(load "format/format-page.lsp")
+(load "format/format-tilde.lsp")
+
+;;; 22.3.2
+(load "format/format-r.lsp")
+(load "format/format-d.lsp")
+(load "format/format-b.lsp")
+(load "format/format-o.lsp")
+(load "format/format-x.lsp")
+
+;;; 22.3.3
+(load "format/format-f.lsp")
+
+;;; 22.3.4
+(load "format/format-a.lsp")
+(load "format/format-s.lsp")
+
+;;; 22.3.5
+(load "format/format-underscore.lsp")
+(load "format/format-logical-block.lsp")
+(load "format/format-i.lsp")
+(load "format/format-slash.lsp")
+
+;;; 22.3.6
+(load "format/format-t.lsp")
+(load "format/format-justify.lsp")
+
+;;; 22.3.7
+(load "format/format-goto.lsp")
+(load "format/format-conditional.lsp")
+(load "format/format-brace.lsp")
+(load "format/format-question.lsp")
+
+;;; 22.3.8
+(load "format/format-paren.lsp")
+(load "format/format-p.lsp")
+
+;;; 22.3.9
+(load "format/format-circumflex.lsp")
+(load "format/format-newline.lsp")
diff --git a/format/roman-numerals.lsp b/printer/format/roman-numerals.lsp
similarity index 99%
rename from format/roman-numerals.lsp
rename to printer/format/roman-numerals.lsp
index 28300abe3da98e32cd5569d001b6916057d4a965..5edb74a4a3dc4c9ecc01ee40994e2c21865cd852 100644
--- a/format/roman-numerals.lsp
+++ b/printer/format/roman-numerals.lsp
@@ -3,7 +3,7 @@
 ;;;; Created:  Thu Jul 29 08:44:15 2004
 ;;;; Contains: The roman numbers from 1 to 3999
 
-(in-package :cl-test)
+
 
 (defparameter *roman-numerals*
   '("I" "II" "III" "IV" "V" "VI" "VII" "VIII" "IX" "X" "XI" "XII" "XIII" "XIV" "XV" "XVI" "XVII"
diff --git a/printer/load.lsp b/printer/load.lsp
index b08ff8cb74954cc5696511fc20dcad8f93096eaf..d4fdfdb098ed17b18ca64b7dd1cbacec2b943baf 100644
--- a/printer/load.lsp
+++ b/printer/load.lsp
@@ -2,7 +2,11 @@
 (compile-and-load "ANSI-TESTS:AUX;printer-aux.lsp")
 (compile-and-load "ANSI-TESTS:AUX;backquote-aux.lsp")
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "copy-pprint-dispatch.lsp")
 
   (load "print-integers.lsp")
@@ -42,5 +46,5 @@
   (load "print-level.lsp")
   (load "print-length.lsp")
 
-  (load "load-format.lsp")
+  (load "format/load.lsp")
 )
diff --git a/reader/load.lsp b/reader/load.lsp
index 1d4c76dc5dd55323cafc6b02a538a416c72c19a3..de2bf595b67c3d0f46f76cdee8cb1f75d2e6e2b6 100644
--- a/reader/load.lsp
+++ b/reader/load.lsp
@@ -1,7 +1,11 @@
 ;;;; Tests of the reader
 (compile-and-load "ANSI-TESTS:AUX;reader-aux.lsp")
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "reader-test.lsp")
   (load "with-standard-io-syntax.lsp")
   (load "copy-readtable.lsp")
@@ -18,5 +22,4 @@
   (load "dispatch-macro-characters.lsp")
 
   (load "syntax.lsp")
-  (load "syntax-tokens.lsp")
-)
+  (load "syntax-tokens.lsp"))
diff --git a/sequences/load.lsp b/sequences/load.lsp
index b65f1be3a7e6772ad07c9c72f5a46f602937a974..ea22f23373b9a788f62d86ac9e87b9131815180a 100644
--- a/sequences/load.lsp
+++ b/sequences/load.lsp
@@ -4,7 +4,11 @@
 (compile-and-load "ANSI-TESTS:AUX;remove-aux.lsp")
 (compile-and-load "ANSI-TESTS:AUX;remove-duplicates-aux.lsp")
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "copy-seq.lsp")
   (load "elt.lsp")
   (load "fill.lsp")
diff --git a/streams/load.lsp b/streams/load.lsp
index 27f279152180d7810f5530cd35813f9aa8f403e2..0e10f9488866204cff0cd721dfbd870d4e546a23 100644
--- a/streams/load.lsp
+++ b/streams/load.lsp
@@ -3,9 +3,11 @@
 ;;;; Created:  Tue Jan 13 19:38:10 2004
 ;;;; Contains: Load files containing tests for section 21 (streams)
 
-(in-package :cl-test)
+(in-package #:cl-test)
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "input-stream-p.lsp")
   (load "output-stream-p.lsp")
   (load "interactive-stream-p.lsp")
diff --git a/strings/load.lsp b/strings/load.lsp
index c616ed5e111424e5291e3be24a5c49f9ae6326c9..3647cb69fc64a11b6557964dc1fbd5e573a1df90 100644
--- a/strings/load.lsp
+++ b/strings/load.lsp
@@ -1,7 +1,11 @@
 ;;; Tests of strings
 (compile-and-load "ANSI-TESTS:AUX;string-aux.lsp")
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "char-schar.lsp")
   (load "string.lsp")
   (load "base-string.lsp")
diff --git a/structures/load.lsp b/structures/load.lsp
index 993031e9d23ea4db518856fdca2a34556c76fbae..f78244f992cbd8be54fccd0e105016090cc5a2bb 100644
--- a/structures/load.lsp
+++ b/structures/load.lsp
@@ -1,6 +1,10 @@
 ;;; Tests of structures
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "structure-00.lsp")
   (load "structures-01.lsp")
   (load "structures-02.lsp")
diff --git a/symbols/load.lsp b/symbols/load.lsp
index 472f84b00544f38a3b69825d44ec5a3b0787b368..5ff13d07e4e12145177b44e03d214c49343fc410 100644
--- a/symbols/load.lsp
+++ b/symbols/load.lsp
@@ -1,7 +1,11 @@
 ;;; Tests of symbols
 (compile-and-load "ANSI-TESTS:AUX;cl-symbols-aux.lsp")
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "cl-symbols.lsp")
   (load "symbolp.lsp")
   (load "keywordp.lsp")
diff --git a/system-construction/load-file.lsp b/system-construction/load-file.lsp
index 731fc5133abfc2d5fc2901b68f1ab711caa6133e..801ca6d08cc7c48b3f5a6846565e8a9a792b510d 100644
--- a/system-construction/load-file.lsp
+++ b/system-construction/load-file.lsp
@@ -3,8 +3,6 @@
 ;;;; Created:  Tue Apr 12 21:51:49 2005
 ;;;; Contains: Tests of LOAD
 
-(in-package :cl-test)
-
 (defun load-file-test (file funname &rest args &key
                             if-does-not-exist
                             (print nil print-p)
diff --git a/system-construction/load.lsp b/system-construction/load.lsp
index 0d03e9cbf8398ac494a50c6c906287178dd4dd2d..cbc5fc9d0a2ba93899f5871bdb1f321f74df41f9 100644
--- a/system-construction/load.lsp
+++ b/system-construction/load.lsp
@@ -5,11 +5,11 @@
 
 (in-package :cl-test)
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "compile-file.lsp")
   (load "load-file.lsp")
   (load "with-compilation-unit.lsp")
   (load "features.lsp")
-  (load "modules.lsp")
-)
-
+  (load "modules.lsp"))
diff --git a/types-and-classes/load.lsp b/types-and-classes/load.lsp
index 5caaae4fcbb24a1c1a0bf8ad73abd4a65ef0c5de..94ed31df1344ab9c06579ef6d0f540e8a858a4f8 100644
--- a/types-and-classes/load.lsp
+++ b/types-and-classes/load.lsp
@@ -1,7 +1,11 @@
 ;;; Tests of types and classes
 (compile-and-load "ANSI-TESTS:AUX;types-aux.lsp")
 
-(let ((*default-pathname-defaults* (pathname *load-pathname*)))
+(in-package #:cl-test)
+
+(let ((*default-pathname-defaults*
+       (make-pathname
+        :directory (pathname-directory *load-pathname*))))
   (load "types-and-class.lsp")
   (load "types-and-class-2.lsp")
   (load "coerce.lsp")
@@ -21,5 +25,4 @@
   (load "standard-generic-function.lsp")
   (load "type-of.lsp")
   (load "typep.lsp")
-  (load "class-precedence-lists.lsp")
-)
+  (load "class-precedence-lists.lsp"))