Index: openacs-4/packages/tlf-survey/tcl/test/tlf-survey-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tlf-survey/tcl/test/tlf-survey-test-procs.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/tlf-survey/tcl/test/tlf-survey-test-procs.tcl	15 Mar 2023 13:09:02 -0000	1.1.2.1
+++ openacs-4/packages/tlf-survey/tcl/test/tlf-survey-test-procs.tcl	20 Mar 2023 12:58:33 -0000	1.1.2.2
@@ -19,20 +19,16 @@
             acs::test::confirm_email -user_id $_user_id
         } {
             #
+            # Delete the test user
+            #
+            acs::test::user::delete \
+                -delete_created_acs_objects -user_id $_user_id
+            #
             # Cleanup: unmount the test instance
             #
             set node_id [site_node::get_node_id_from_object_id -object_id $_test_instance_package_id]
             site_node::unmount -node_id $node_id
             site_node::delete -node_id $node_id -delete_package
-            #
-            # Delete the test user
-            #
-            ::xo::dc list delete {
-                select acs_object__delete(object_id)
-                from acs_objects
-                where creation_user in (:_user_id)
-            }
-            acs::test::user::delete -user_id $_user_id
         }
 
     aa_register_case -init_classes {tlf_survey_require_test_instance} -cats {web} -procs {