Index: trunk/psLib/test/Makefile.am
===================================================================
--- trunk/psLib/test/Makefile.am	(revision 8717)
+++ trunk/psLib/test/Makefile.am	(revision 8718)
@@ -1,12 +1,5 @@
 SUBDIRS = tap $(SRCDIRS)
-
-EXTRA_DIST = runTest FullUnitTest
 
 CLEANFILES = core core.* *~
 
-all:
-	chmod a+x FullUnitTest
-
 test: check
-
-tests:
Index: trunk/psLib/test/astro/Makefile.am
===================================================================
--- trunk/psLib/test/astro/Makefile.am	(revision 8717)
+++ trunk/psLib/test/astro/Makefile.am	(revision 8718)
@@ -1,28 +1,7 @@
- #Makefile for astro tests of psLib
-#
-
-AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
-AM_LDFLAGS = $(top_builddir)/src/libpslib.la $(PSLIB_LIBS)
-
-TESTS =  \
-	tst_psCoord01 \
-	tst_psCoord02 \
-	tst_psTime_01 \
-	tst_psTime_02 \
-	tst_psTime_03 \
-	tst_psTime_04 \
-	tst_psCoord \
-	tst_psEarthOrientation \
-	tst_psSphereOps
-
-tst_psTime_01_SOURCES = tst_psTime_01.c
-tst_psTime_02_SOURCES = tst_psTime_02.c
-tst_psTime_03_SOURCES = tst_psTime_03.c
-tst_psTime_04_SOURCES = tst_psTime_04.c
-tst_psCoord_SOURCES = tst_psCoord.c
-tst_psSphereOps_SOURCES = tst_psSphereOps.c
-tst_psCoord01_SOURCES = tst_psCoord01.c
-tst_psCoord02_SOURCES = tst_psCoord02.c
-tst_psEarthOrientation_SOURCES = tst_psEarthOrientation.c
+AM_CPPFLAGS = $(SRCINC) -I$(top_srcdir)/test/tap/src $(PSLIB_CFLAGS)
+AM_LDFLAGS = \
+	$(top_builddir)/src/libpslib.la  \
+	$(top_builddir)/test/tap/src/libtap.la \
+	$(PSLIB_LIBS)
 
 check_DATA = \
@@ -34,14 +13,7 @@
 	test.ser7.dat
 
-check_PROGRAMS = $(TESTS)
+check_PROGRAMS =
 
-TESTS_ENVIRONMENT = export PS_CONFIG_FILE="pslib.config" && perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified
-
-EXTRA_DIST = data verified
-EXTRA_PROGRAMS = tst_psCoord
-
-tests: $(check_DATA) $(TESTS)
-
-CLEANFILES = $(TESTS) $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
+CLEANFILES = $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
 
 pslib.config: $(top_srcdir)/etc/pslib/pslib.config.template
@@ -63,7 +35,3 @@
 	cp $? $@
 
-tests: $(check_DATA) $(TESTS)
-
 test: check
-
-
Index: trunk/psLib/test/db/Makefile.am
===================================================================
--- trunk/psLib/test/db/Makefile.am	(revision 8717)
+++ trunk/psLib/test/db/Makefile.am	(revision 8718)
@@ -1,22 +1,11 @@
-#Makefile for db tests of psLib
-#
-AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
-AM_LDFLAGS = $(top_builddir)/src/libpslib.la $(PSLIB_LIBS)
+AM_CPPFLAGS = $(SRCINC) -I$(top_srcdir)/test/tap/src $(PSLIB_CFLAGS)
+AM_LDFLAGS = \
+	$(top_builddir)/src/libpslib.la  \
+	$(top_builddir)/test/tap/src/libtap.la \
+	$(PSLIB_LIBS)
 
-TESTS = \
-	@TST_PSDB@
+check_PROGRAMS = 
 
-tst_psDB_SOURCES = tst_psDB.c
-
-check_DATA =
-
-check_PROGRAMS = $(TESTS)
-
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
-
-EXTRA_PROGRAMS = tst_psDB
-EXTRA_DIST = verified
-
-CLEANFILES = $(TESTS) $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
+CLEANFILES = $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
 
 clean-local:
@@ -34,5 +23,3 @@
 	true
 
-tests: $(check_DATA) $(TESTS)
-
 test: check
Index: trunk/psLib/test/fft/Makefile.am
===================================================================
--- trunk/psLib/test/fft/Makefile.am	(revision 8717)
+++ trunk/psLib/test/fft/Makefile.am	(revision 8718)
@@ -1,25 +1,11 @@
-#Makefile for fft tests of psLib
-#
-AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
-AM_LDFLAGS = $(top_builddir)/src/libpslib.la $(PSLIB_LIBS)
+AM_CPPFLAGS = $(SRCINC) -I$(top_srcdir)/test/tap/src $(PSLIB_CFLAGS)
+AM_LDFLAGS = \
+	$(top_builddir)/src/libpslib.la  \
+	$(top_builddir)/test/tap/src/libtap.la \
+	$(PSLIB_LIBS)
 
-TESTS = \
-	tst_psImageFFT \
-	tst_psVectorFFT
+check_PROGRAMS =
 
-tst_psVectorFFT_SOURCES = tst_psVectorFFT.c
-tst_psImageFFT_SOURCES = tst_psImageFFT.c
-
-check_DATA =
-
-check_PROGRAMS = $(TESTS)
-
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
-
-EXTRA_DIST = verified
-
-CLEANFILES = $(TESTS) $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
-
-tests: $(TESTS) $(check_DATA)
+CLEANFILES = $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
 
 test: check
Index: trunk/psLib/test/fits/Makefile.am
===================================================================
--- trunk/psLib/test/fits/Makefile.am	(revision 8717)
+++ trunk/psLib/test/fits/Makefile.am	(revision 8718)
@@ -1,24 +1,12 @@
-#Makefile for fits tests of psLib
-#
-AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
-AM_LDFLAGS = $(top_builddir)/src/libpslib.la $(PSLIB_LIBS)
+AM_CPPFLAGS = $(SRCINC) -I$(top_srcdir)/test/tap/src $(PSLIB_CFLAGS)
+AM_LDFLAGS = \
+	$(top_builddir)/src/libpslib.la  \
+	$(top_builddir)/test/tap/src/libtap.la \
+	$(PSLIB_LIBS)
 
-TESTS = \
-	tst_psFits
+check_PROGRAMS =
 
-tst_psFits_SOURCES = tst_psFits.c
-
-check_DATA =
-
-check_PROGRAMS = $(TESTS)
-
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
-
-EXTRA_DIST = verified
-
-CLEANFILES = $(TESTS) $(check_DATA) temp/* multi.fits table.fits tmpImages/* core core.* *~ \
+CLEANFILES = $(check_DATA) temp/* multi.fits table.fits tmpImages/* core core.* *~ \
 	*.bb *.bbg *.da gmon.out
 
-tests: $(check_DATA) $(TESTS)
-
 test: check
Index: trunk/psLib/test/imageops/Makefile.am
===================================================================
--- trunk/psLib/test/imageops/Makefile.am	(revision 8717)
+++ trunk/psLib/test/imageops/Makefile.am	(revision 8718)
@@ -1,40 +1,12 @@
-#Makefile for imageops tests of psLib
-#
-AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) -DVERIFIED_DIR=\"$(srcdir)/verified\"
-AM_LDFLAGS = $(top_builddir)/src/libpslib.la $(PSLIB_LIBS)
+AM_CPPFLAGS = $(SRCINC) -I$(top_srcdir)/test/tap/src $(PSLIB_CFLAGS)
+AM_LDFLAGS = \
+	$(top_builddir)/src/libpslib.la  \
+	$(top_builddir)/test/tap/src/libtap.la \
+	$(PSLIB_LIBS)
 
-TESTS = \
-	tst_psImageConvolve \
-	tst_psImageGeomManip \
-	tst_psImageInterpolate \
-	tst_psImagePixelExtract \
-	tst_psImagePixelManip \
-	tst_psImageStats \
-	tst_psImageStructManip \
-	tst_psImageSmooth \
-    tst_psImageMaskOps
+check_PROGRAMS =
 
-tst_psImageConvolve_SOURCES =  tst_psImageConvolve.c
-tst_psImageGeomManip_SOURCES =  tst_psImageGeomManip.c
-tst_psImageInterpolate_SOURCES =  tst_psImageInterpolate.c
-tst_psImagePixelExtract_SOURCES =  tst_psImagePixelExtract.c
-tst_psImagePixelManip_SOURCES =  tst_psImagePixelManip.c
-tst_psImageSmooth_SOURCES = tst_psImageSmooth.c
-tst_psImageStats_SOURCES =  tst_psImageStats.c
-tst_psImageStructManip_SOURCES =  tst_psImageStructManip.c
-tst_psImageMaskOps_SOURCES = tst_psImageMaskOps.c
-
-check_DATA =
-
-check_PROGRAMS = $(TESTS)
-
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
-
-EXTRA_DIST = verified
-
-CLEANFILES = $(TESTS) $(check_DATA) temp/* fOut.fits sOut.fits fBiOut.fits sBiOut.fits \
+CLEANFILES = $(check_DATA) temp/* fOut.fits sOut.fits fBiOut.fits sBiOut.fits \
 	core core.* *~ *.bb *.bbg *.da gmon.out
 
-tests: $(TESTS) $(check_DATA)
-
 test: check
Index: trunk/psLib/test/jpeg/Makefile.am
===================================================================
--- trunk/psLib/test/jpeg/Makefile.am	(revision 8717)
+++ trunk/psLib/test/jpeg/Makefile.am	(revision 8718)
@@ -1,20 +1,11 @@
-#Makefile for image jpeg tests of psLib
-#
-AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) -DVERIFIED_DIR=\"$(srcdir)/verified\"
-AM_LDFLAGS = $(top_builddir)/src/libpslib.la $(PSLIB_LIBS)
+AM_CPPFLAGS = $(SRCINC) -I$(top_srcdir)/test/tap/src $(PSLIB_CFLAGS)
+AM_LDFLAGS = \
+	$(top_builddir)/src/libpslib.la  \
+	$(top_builddir)/test/tap/src/libtap.la \
+	$(PSLIB_LIBS)
 
-TESTS = 
+check_PROGRAMS =
 
-check_DATA =
-
-check_PROGRAMS = $(TESTS)
-
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
-
-#EXTRA_DIST = verified
-
-CLEANFILES = $(TESTS) $(check_DATA) core core.* *~ *.bb *.bbg *.da gmon.out
-
-tests: $(TESTS) $(check_DATA)
+CLEANFILES = $(check_DATA) core core.* *~ *.bb *.bbg *.da gmon.out
 
 test: check
Index: trunk/psLib/test/math/Makefile.am
===================================================================
--- trunk/psLib/test/math/Makefile.am	(revision 8717)
+++ trunk/psLib/test/math/Makefile.am	(revision 8718)
@@ -1,94 +1,11 @@
-AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
-AM_LDFLAGS = $(top_builddir)/src/libpslib.la $(PSLIB_LIBS)
+AM_CPPFLAGS = $(SRCINC) -I$(top_srcdir)/test/tap/src $(PSLIB_CFLAGS)
+AM_LDFLAGS = \
+	$(top_builddir)/src/libpslib.la  \
+	$(top_builddir)/test/tap/src/libtap.la \
+	$(PSLIB_LIBS)
 
-TESTS = \
-    tst_psFunc01 \
-    tst_psHist00 \
-    tst_psHist01 \
-    tst_psHist02 \
-    tst_psHist03 \
-    tst_psMathUtils \
-    tst_psMatrix01 \
-    tst_psMatrix02 \
-    tst_psMatrix03 \
-    tst_psMatrix04 \
-    tst_psMatrix05 \
-    tst_psMatrix06 \
-    tst_psMatrix07 \
-    tst_psMatrixVectorArithmetic01 \
-    tst_psMatrixVectorArithmetic02 \
-    tst_psMatrixVectorArithmetic03 \
-    tst_psMatrixVectorArithmetic04 \
-    tst_psMinimizePowell \
-    tst_psMinimizeLMM \
-    tst_psStats00 \
-    tst_psStats01 \
-    tst_psStats02 \
-    tst_psStats03 \
-    tst_psStats05 \
-    tst_psStats06 \
-    tst_psStats07 \
-    tst_psStats08 \
-    tst_psStats09 \
-    tst_psSpline1D \
-    tst_psRandom \
-    tst_psPolynomial \
-    tst_psPolynomialEval1D \
-    tst_psPolynomialEval2D \
-    tst_psPolynomialEval3D \
-    tst_psPolynomialEval4D \
-    tst_psPolyFit1D \
-    tst_psPolyFit2D \
-    tst_psPolyFit3D \
-    tst_psPolyFit4D
+check_PROGRAMS =
 
-tst_psFunc01_SOURCES =  tst_psFunc01.c
-tst_psHist00_SOURCES =  tst_psHist00.c
-tst_psHist01_SOURCES =  tst_psHist01.c
-tst_psHist02_SOURCES =  tst_psHist02.c
-tst_psHist03_SOURCES =  tst_psHist03.c
-tst_psMathUtils_SOURCES =  tst_psMathUtils.c
-tst_psMatrix01_SOURCES =  tst_psMatrix01.c
-tst_psMatrix02_SOURCES =  tst_psMatrix02.c
-tst_psMatrix03_SOURCES =  tst_psMatrix03.c
-tst_psMatrix04_SOURCES =  tst_psMatrix04.c
-tst_psMatrix05_SOURCES =  tst_psMatrix05.c
-tst_psMatrix06_SOURCES =  tst_psMatrix06.c
-tst_psMatrix07_SOURCES =  tst_psMatrix07.c
-tst_psMatrixVectorArithmetic01_SOURCES =  tst_psMatrixVectorArithmetic01.c
-tst_psMatrixVectorArithmetic02_SOURCES =  tst_psMatrixVectorArithmetic02.c
-tst_psMatrixVectorArithmetic03_SOURCES =  tst_psMatrixVectorArithmetic03.c
-tst_psMatrixVectorArithmetic04_SOURCES =  tst_psMatrixVectorArithmetic04.c
-tst_psMinimizePowell_SOURCES = tst_psMinimizePowell.c
-tst_psMinimizeLMM_SOURCES = tst_psMinimizeLMM.c
-tst_psStats00_SOURCES =  tst_psStats00.c
-tst_psStats01_SOURCES =  tst_psStats01.c
-tst_psStats02_SOURCES =  tst_psStats02.c
-tst_psStats03_SOURCES =  tst_psStats03.c
-tst_psStats05_SOURCES =  tst_psStats05.c
-tst_psStats06_SOURCES =  tst_psStats06.c
-tst_psStats07_SOURCES =  tst_psStats07.c
-tst_psStats08_SOURCES =  tst_psStats08.c
-tst_psStats09_SOURCES =  tst_psStats09.c
-tst_psRandom_SOURCES =  tst_psRandom.c
-tst_psPolynomial_SOURCES = tst_psPolynomial.c
-tst_psPolynomialEval1D_SOURCES = tst_psPolynomialEval1D.c
-tst_psPolynomialEval2D_SOURCES = tst_psPolynomialEval2D.c
-tst_psPolynomialEval3D_SOURCES = tst_psPolynomialEval3D.c
-tst_psPolynomialEval4D_SOURCES = tst_psPolynomialEval4D.c
-tst_psPolyFit1D_SOURCES = tst_psPolyFit1D.c
-tst_psPolyFit2D_SOURCES = tst_psPolyFit2D.c
-tst_psPolyFit3D_SOURCES = tst_psPolyFit3D.c
-tst_psPolyFit4D_SOURCES = tst_psPolyFit4D.c
+CLEANFILES = $(check_DATA) temp/* seed_msglog1.txt core core.* *~ *.bb *.bbg *.da gmon.out
 
-check_DATA =
-check_PROGRAMS = $(TESTS)
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
-EXTRA_DIST = verified
-CLEANFILES = $(TESTS) $(check_DATA) temp/* seed_msglog1.txt core core.* *~ *.bb *.bbg *.da gmon.out
-tests: $(check_DATA) $(TESTS)
 test: check
-
-
-
-
Index: trunk/psLib/test/mathtypes/Makefile.am
===================================================================
--- trunk/psLib/test/mathtypes/Makefile.am	(revision 8717)
+++ trunk/psLib/test/mathtypes/Makefile.am	(revision 8718)
@@ -1,40 +1,12 @@
-#Makefile for mathtypes tests
-#
-AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
-AM_LDFLAGS = $(top_builddir)/src/libpslib.la $(PSLIB_LIBS)
+AM_CPPFLAGS = $(SRCINC) -I$(top_srcdir)/test/tap/src $(PSLIB_CFLAGS)
+AM_LDFLAGS = \
+	$(top_builddir)/src/libpslib.la  \
+	$(top_builddir)/test/tap/src/libtap.la \
+	$(PSLIB_LIBS)
 
-TESTS = \
-	tst_psImage \
-	tst_psScalar \
-	tst_psVector \
-	tst_psVectorSort_01 \
-	tst_psVectorSort_02 \
-	tst_psVectorSort_03 \
-	tst_psVectorSort_04 \
+check_PROGRAMS = \
 	tap_psVector
 
-tst_psImage_SOURCES =  tst_psImage.c
-tst_psScalar_SOURCES =  tst_psScalar.c
-tst_psVector_SOURCES =  tst_psVector.c
-tst_psVectorSort_01_SOURCES =  tst_psVectorSort_01.c
-tst_psVectorSort_02_SOURCES =  tst_psVectorSort_02.c
-tst_psVectorSort_03_SOURCES =  tst_psVectorSort_03.c
-tst_psVectorSort_04_SOURCES =  tst_psVectorSort_04.c
-
-
-tap_psVector_CPPFLAGS 	= $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
-tap_psVector_LDFLAGS 	= $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
-
-TESTS_ENVIRONMENT =     $(SHELL)
-
-check_PROGRAMS = $(TESTS)
-
-#TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
-
-EXTRA_DIST = verified
-
-CLEANFILES = $(TESTS) $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
-
-tests: $(check_DATA) $(TESTS)
+CLEANFILES = $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
 
 test: check
Index: trunk/psLib/test/sys/Makefile.am
===================================================================
--- trunk/psLib/test/sys/Makefile.am	(revision 8717)
+++ trunk/psLib/test/sys/Makefile.am	(revision 8718)
@@ -1,42 +1,13 @@
-#Makefile for sys tests
-#
-AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
-AM_LDFLAGS = $(top_builddir)/src/libpslib.la $(PSLIB_LIBS)
+AM_CPPFLAGS = $(SRCINC) -I$(top_srcdir)/test/tap/src $(PSLIB_CFLAGS)
+AM_LDFLAGS = \
+	$(top_builddir)/src/libpslib.la  \
+	$(top_builddir)/test/tap/src/libtap.la \
+	$(PSLIB_LIBS)
 
-TESTS = \
-	tst_psAbort \
-	tst_psConfigure \
-	tst_psError \
-	tst_psLogMsg \
-	tst_psMemory \
-	tst_psString \
-	tst_psTrace \
-	tap_psStringSubstitute \
-	tst_psLine
+check_PROGRAMS = \
+	tap_psStringSubstitute
 
-tst_psAbort_SOURCES =  tst_psAbort.c
-tst_psConfigure_SOURCES =  tst_psConfigure.c
-tst_psError_SOURCES =  tst_psError.c
-tst_psLogMsg_SOURCES =  tst_psLogMsg.c
-tst_psMemory_SOURCES =  tst_psMemory.c
-tst_psString_SOURCES =  tst_psString.c
-tst_psTrace_SOURCES =  tst_psTrace.c
-tst_psLine_SOURCES =  tst_psLine.c
-
-tap_psStringSubstitute_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
-tap_psStringSubstitute_LDFLAGS 	= $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
-
-check_DATA =
-
-check_PROGRAMS = $(TESTS)
-
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
-
-EXTRA_DIST = verified
-
-CLEANFILES = $(TESTS) $(check_DATA) temp/* log.txt log2.txt test.fits tst_psTrace02_OUT \
+CLEANFILES = $(check_DATA) temp/* log.txt log2.txt test.fits tst_psTrace02_OUT \
 	core core.* *~ *.bb *.bbg *.da gmon.out
 
-tests: $(check_DATA) $(TESTS)
-
 test: check
Index: trunk/psLib/test/types/Makefile.am
===================================================================
--- trunk/psLib/test/types/Makefile.am	(revision 8717)
+++ trunk/psLib/test/types/Makefile.am	(revision 8718)
@@ -1,24 +1,10 @@
-#Makefile for types tests
-#
-AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) -DVERIFIED_DIR=\"$(srcdir)/verified\"
-AM_LDFLAGS = $(top_builddir)/src/libpslib.la $(PSLIB_LIBS)
+AM_CPPFLAGS = $(SRCINC) -I$(top_srcdir)/test/tap/src $(PSLIB_CFLAGS) 
+AM_LDFLAGS = \
+	$(top_builddir)/src/libpslib.la  \
+	$(top_builddir)/test/tap/src/libtap.la \
+	$(PSLIB_LIBS) 
 AM_CFLAGS = -DXML_CONFIG_FILE="\"$(top_srcdir)/etc/pslib/psTime.xml\""
 
-
-TESTS = \
-	tst_psHash00          \
-	tst_psHash01          \
-	tst_psHash02          \
-	tst_psHash03          \
-	tst_psHash04          \
-	tst_psMetadata_01 \
-	tst_psMetadata_02 \
-	tst_psMetadata_03 \
-	tst_psMetadata_04 \
-	tst_psMetadata_05 \
-	tst_psMetadata_06 \
-	tst_psMetadata_07 \
-	tst_psPixels \
-	tst_psArguments \
+check_PROGRAMS = \
 	tap_psMetadataIterator \
 	tap_psListIterator \
@@ -32,65 +18,4 @@
 	tap_psMetadata_polynomials \
 	tap_psArray_all
-#	tst_psArray
-#	tst_psBitSet
-#	tst_psHash05
-#	tst_psList
-#	tst_psLookupTable_01
-#	tst_psMetadataIO
-
-
-# tst_psArray_SOURCES = tst_psArray.c
-# tst_psBitSet_SOURCES = tst_psBitSet.c
-tst_psHash00_SOURCES = tst_psHash00.c
-tst_psHash01_SOURCES = tst_psHash01.c
-tst_psHash02_SOURCES = tst_psHash02.c
-tst_psHash03_SOURCES = tst_psHash03.c
-tst_psHash04_SOURCES = tst_psHash04.c
-# tst_psHash05_SOURCES = tst_psHash05.c
-# tst_psList_SOURCES = tst_psList.c
-# tst_psLookupTable_01_SOURCES = tst_psLookupTable_01.c
-tst_psMetadata_01_SOURCES = tst_psMetadata_01.c
-tst_psMetadata_02_SOURCES = tst_psMetadata_02.c
-tst_psMetadata_03_SOURCES = tst_psMetadata_03.c
-tst_psMetadata_04_SOURCES = tst_psMetadata_04.c
-tst_psMetadata_05_SOURCES = tst_psMetadata_05.c
-tst_psMetadata_06_SOURCES = tst_psMetadata_06.c
-tst_psMetadata_07_SOURCES = tst_psMetadata_07.c
-# tst_psMetadataIO_SOURCES = tst_psMetadataIO.c
-tst_psPixels_SOURCES = tst_psPixels.c
-tst_psArguments_SOURCES = tst_psArguments.c
-
-tap_psMetadataIterator_CPPFLAGS   = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
-tap_psMetadataIterator_LDFLAGS    = $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
-
-tap_psListIterator_CPPFLAGS   = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
-tap_psListIterator_LDFLAGS    = $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
-
-tap_psMetadataConfigParse_CPPFLAGS   = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
-tap_psMetadataConfigParse_LDFLAGS    = $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
-
-tap_psMetadataItemCompare_CPPFLAGS   = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
-tap_psMetadataItemCompare_LDFLAGS    = $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
-
-tap_psMetadataItemParse_CPPFLAGS   = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
-tap_psMetadataItemParse_LDFLAGS    = $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
-
-tap_psMetadata_printing_CPPFLAGS   = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
-tap_psMetadata_printing_LDFLAGS    = $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
-
-tap_psMetadata_copying_CPPFLAGS   = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
-tap_psMetadata_copying_LDFLAGS    = $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
-
-tap_psMetadata_creating_CPPFLAGS   = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
-tap_psMetadata_creating_LDFLAGS    = $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
-
-tap_psMetadata_manip_CPPFLAGS   = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
-tap_psMetadata_manip_LDFLAGS    = $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
-
-tap_psMetadata_polynomials_CPPFLAGS   = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
-tap_psMetadata_polynomials_LDFLAGS    = $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
-
-tap_psArray_all_CPPFLAGS   = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
-tap_psArray_all_LDFLAGS    = $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
 
 check_DATA = \
@@ -111,10 +36,5 @@
     mdcfgwrt.verified
 
-check_PROGRAMS = $(TESTS)
-
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
-
 EXTRA_DIST = \
-	verified \
 	data/header_1.fits \
 	data/header_2.fits \
@@ -127,9 +47,6 @@
     data/mdcfgwrt.verified
 
-
-CLEANFILES = $(TESTS) $(check_DATA) multi.fits table.fits temp/* MDCopy.in MDCopy.out mdcfgwrt.out \
+CLEANFILES = $(check_DATA) multi.fits table.fits temp/* MDCopy.in MDCopy.out mdcfgwrt.out \
 	core core.* *~ *.bb *.bbg *.da gmon.out
-
-tests: $(check_DATA) $(TESTS)
 
 %.dat: verified/%.dat
Index: trunk/psLib/test/xml/Makefile.am
===================================================================
--- trunk/psLib/test/xml/Makefile.am	(revision 8717)
+++ trunk/psLib/test/xml/Makefile.am	(revision 8718)
@@ -1,24 +1,14 @@
-#Makefile for types tests
-#
-AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) -DSRCDIR=\"$(srcdir)\"
-AM_LDFLAGS = $(top_builddir)/src/libpslib.la $(PSLIB_LIBS)
+AM_CPPFLAGS = $(SRCINC) -I$(top_srcdir)/test/tap/src $(PSLIB_CFLAGS)
+AM_LDFLAGS = \
+	$(top_builddir)/src/libpslib.la  \
+	$(top_builddir)/test/tap/src/libtap.la \
+	$(PSLIB_LIBS)
 
-TESTS = \
-    tst_psXML
+check_PROGRAMS =
 
-tst_psXML_SOURCES = tst_psXML.c
+EXTRA_DIST = psTime.xml psTime2.xml psTime3.xml psTime4.xml
 
-check_DATA =
-
-check_PROGRAMS = $(TESTS)
-
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
-
-EXTRA_DIST = verified psTime.xml psTime2.xml psTime3.xml psTime4.xml
-
-CLEANFILES = $(TESTS) $(check_DATA) temp/* psTest5.xml psTest2.xml psTest.xml psTest3.xml psTest4.xml \
+CLEANFILES = $(check_DATA) temp/* psTest5.xml psTest2.xml psTest.xml psTest3.xml psTest4.xml \
 	core core.* *~ *.bb *.bbg *.da gmon.out
 
-tests: $(check_DATA) $(TESTS)
-
 test: check