Index: openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl,v
diff -u -r1.1.2.44 -r1.1.2.45
--- openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl	3 Mar 2021 15:02:40 -0000	1.1.2.44
+++ openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl	3 Mar 2021 16:45:02 -0000	1.1.2.45
@@ -612,6 +612,7 @@
                 }]
             aa_log "Form  $form_name created"
 
+
             set page_name $lang:r1
             ###########################################################
             aa_section "Create an instance $page_name of $form_name"
@@ -685,6 +686,12 @@
             #
             # In case something has to be cleaned manually, do it here.
             #
+            if {$package_id ne "" && $instance ne ""} {
+                apm_package_instance_delete $package_id
+                set node_id [site_node::get_element -url $instance -element node_id]
+                site_node::delete -node_id $node_id -delete_package
+            }
+            acs::test::user::delete -user_id $user_id
         }
     }
 }