Index: trunk/ippdb/tests/testsuite.at
===================================================================
--- trunk/ippdb/tests/testsuite.at	(revision 7461)
+++ trunk/ippdb/tests/testsuite.at	(revision 9423)
@@ -60,16 +60,4 @@
 
 ###
-AT_SETUP([Pop()])
-AT_KEYWORDS([Pop])
-
-AT_CHECK([dbsetup])
-# run insert so there is a row in the table
-AT_CHECK([insert])
-AT_CHECK([pop])
-AT_CHECK([dbcleanup])
-
-AT_CLEANUP
-
-###
 AT_SETUP([InsertObject()])
 AT_KEYWORDS([InsertObject])
@@ -77,16 +65,4 @@
 AT_CHECK([dbsetup])
 AT_CHECK([insertobject])
-AT_CHECK([dbcleanup])
-
-AT_CLEANUP
-
-###
-AT_SETUP([PopObject()])
-AT_KEYWORDS([PopObject])
-
-AT_CHECK([dbsetup])
-# run insert so there is a row in the table
-AT_CHECK([insert])
-AT_CHECK([popobject])
 AT_CHECK([dbcleanup])
 
@@ -101,21 +77,6 @@
 AT_CHECK([insert])
 # run popfis so there is afits file to read
-AT_CHECK([popfits])
+AT_CHECK([selectrowsfits])
 AT_CHECK([insertfits])
-AT_CHECK([dbcleanup])
-if [ test -f "blargh" ] ; then
-    rm -f "blargh"
-fi
-
-AT_CLEANUP
-
-###
-AT_SETUP([PopFits()])
-AT_KEYWORDS([PopFits])
-
-AT_CHECK([dbsetup])
-# run insert so there is a row in the table
-AT_CHECK([insert])
-AT_CHECK([popfits])
 AT_CHECK([dbcleanup])
 if [ test -f "blargh" ] ; then