Index: openacs-4/packages/xotcl-core/tcl/test/xotcl-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/test/Attic/xotcl-test-procs.tcl,v
diff -u -N -r1.1.2.8 -r1.1.2.9
--- openacs-4/packages/xotcl-core/tcl/test/xotcl-test-procs.tcl	17 Apr 2019 14:54:10 -0000	1.1.2.8
+++ openacs-4/packages/xotcl-core/tcl/test/xotcl-test-procs.tcl	23 Apr 2019 14:26:29 -0000	1.1.2.9
@@ -68,7 +68,7 @@
         set new_context_id [::xo::dc get_value get_context_id {
             select min(object_id) from acs_objects
             where object_id <> :object_id
-              and object_id <> :old_context_id
+              and (:old_context_id is null or object_id <> :old_context_id)
         }]
         aa_log "Setting a different context_id: $new_context_id"
         $orm_object set context_id $new_context_id
@@ -201,7 +201,7 @@
         set new_context_id [::xo::dc get_value get_context_id {
             select min(object_id) from acs_objects
             where object_id <> :object_id
-              and object_id <> :old_context_id
+              and (:old_context_id is null or object_id <> :old_context_id)
         }]
         aa_log "Setting a different context_id: $new_context_id"
         $orm_object set context_id $new_context_id