Index: openacs-4/packages/oacs-dav/tcl/test/oacs-dav-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/tcl/test/oacs-dav-procs.tcl,v
diff -u -r1.6.2.4 -r1.6.2.5
--- openacs-4/packages/oacs-dav/tcl/test/oacs-dav-procs.tcl	2 Mar 2021 12:01:30 -0000	1.6.2.4
+++ openacs-4/packages/oacs-dav/tcl/test/oacs-dav-procs.tcl	20 Sep 2022 12:24:32 -0000	1.6.2.5
@@ -11,21 +11,29 @@
 aa_register_case oacs_dav_sc_create {
     Test creation of DAV service contract
 } {
-    aa_run_with_teardown -rollback -test_code {
+    aa_true "DAV Service contract created" [db_0or1row get_dav_sc {
+        select * from acs_sc_contracts where contract_name='dav'
+    }]
+    set sc_ops [db_list get_dav_ops {
+        select operation_name from acs_sc_operations where contract_name='dav'
+    }]
+    set valid_ops [list get put mkcol copy propfind proppatch move delete]
+    foreach op_name $valid_ops {
+        aa_true "$op_name operation created" \
+            {$op_name in $sc_ops}
+    }
 
-        aa_true "DAV Service contract created" [expr [db_0or1row get_dav_sc ""]]
-        set sc_ops [db_list get_dav_ops ""]
-        set valid_ops [list get put mkcol copy propfind proppatch move delete]
-        foreach op_name $valid_ops {
-            aa_true "$op_name operation created" \
-                {[lsearch $sc_ops $op_name] > -1}
-        }
+    aa_true "DAV put_type Service contract created" \
+        [db_0or1row get_dav_pt_sc {
+            select * from acs_sc_contracts where contract_name='dav_put_type'
+        }]
+    aa_true "get_type operation created" \
+        [db_0or1row get_dav_pt_op {
+            select operation_name from acs_sc_operations where
+            contract_name='dav_put_type'
+            and operation_name='get_type'
 
-        aa_true "DAV put_type Service contract created" \
-            [expr [db_0or1row get_dav_pt_sc ""]]
-        aa_true "get_type operation created" \
-            [expr [db_0or1row get_dav_pt_op ""]]
-    }
+        }]
 }
 
 aa_register_case -procs {
Index: openacs-4/packages/oacs-dav/tcl/test/oacs-dav-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/tcl/test/oacs-dav-procs.xql,v
diff -u -r1.1.1.1.20.1 -r1.1.1.1.20.2
--- openacs-4/packages/oacs-dav/tcl/test/oacs-dav-procs.xql	2 Mar 2021 12:01:31 -0000	1.1.1.1.20.1
+++ openacs-4/packages/oacs-dav/tcl/test/oacs-dav-procs.xql	20 Sep 2022 12:24:32 -0000	1.1.1.1.20.2
@@ -5,33 +5,6 @@
 <!-- @cvs-id $Id$ -->
 <queryset>
 
-  <fullquery name="_oacs-dav__oacs_dav_sc_create.get_dav_sc">
-    <querytext>
-      select * from acs_sc_contracts where contract_name='dav'
-    </querytext>
-  </fullquery>
-
-  <fullquery name="_oacs-dav__oacs_dav_sc_create.get_dav_pt_sc">
-    <querytext>
-      select * from acs_sc_contracts where contract_name='dav_put_type'
-    </querytext>
-  </fullquery>
-
-  
-  <fullquery name="_oacs-dav__oacs_dav_sc_create.get_dav_ops">
-    <querytext>
-      select operation_name from acs_sc_operations where contract_name='dav'
-    </querytext>
-  </fullquery>
-
-  <fullquery name="_oacs-dav__oacs_dav_sc_create.get_dav_pt_op">
-    <querytext>
-      select operation_name from acs_sc_operations where
-      contract_name='dav_put_type'
-      and operation_name='get_type'
-    </querytext>
-  </fullquery>
-  
   <fullquery name="_oacs-dav__oacs_dav_put.item_exists">
     <querytext>
       select item_id from cr_items where name=:name