Index: openacs-4/packages/xowiki/tcl/link-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/link-procs.tcl,v
diff -u -r1.106.2.20 -r1.106.2.21
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	28 Dec 2021 18:05:59 -0000	1.106.2.20
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	31 Dec 2021 11:22:34 -0000	1.106.2.21
@@ -482,12 +482,10 @@
       if {[info exists :revision_id]} {
         append href ?revision_id=${:revision_id}
       }
-      return [ns_trim [subst {$pre<a $cls href='[ns_quotehtml $href]'><img $cls src='[ns_quotehtml $link]'
-        alt='$label' title='$label' $style></a>$post}]]
+      return [subst {$pre<a $cls href='[ns_quotehtml $href]'><img $cls src='[ns_quotehtml $link]' alt='$label' title='$label' $style></a>$post}]
     } else {
       if {[info exists :revision_id]} {append link ?revision_id=${:revision_id}}
-      return [ns_trim [subst {$pre<img $cls src='[ns_quotehtml $link]'
-        alt='$label' title='$label' $style>$post}]]
+      return [subst {$pre<img $cls src='[ns_quotehtml $link]' alt='$label' title='$label' $style>$post}]
     }
   }
 
Index: openacs-4/packages/xowiki/tcl/test/api-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/test/api-test-procs.tcl,v
diff -u -r1.1.2.12 -r1.1.2.13
--- openacs-4/packages/xowiki/tcl/test/api-test-procs.tcl	22 Jun 2021 17:34:28 -0000	1.1.2.12
+++ openacs-4/packages/xowiki/tcl/test/api-test-procs.tcl	31 Dec 2021 11:22:34 -0000	1.1.2.13
@@ -24,7 +24,7 @@
     } {
         set package_id [acs::test::require_package_instance \
                             -package_key xowiki]
-        ::xowiki::Package initialize -package_id $package_id
+        ::xowiki::Package require $package_id
 
         #
         # Don't allow addressing outside of the jail
Index: openacs-4/packages/xowiki/tcl/test/xowiki-admin-tests-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/test/xowiki-admin-tests-procs.tcl,v
diff -u -r1.1.2.20 -r1.1.2.21
--- openacs-4/packages/xowiki/tcl/test/xowiki-admin-tests-procs.tcl	25 Nov 2021 14:53:55 -0000	1.1.2.20
+++ openacs-4/packages/xowiki/tcl/test/xowiki-admin-tests-procs.tcl	31 Dec 2021 11:22:34 -0000	1.1.2.21
@@ -1262,17 +1262,17 @@
         set l "parentpage"
         set test [label "link" "existing simple page" $l]
         set link [p create_link $l]
-        ? {$link render} "<a   href='/$instance_name/de/parentpage'>parentpage</a>" "\n$test\n "
+        ? {$link render} "<a   href='/$instance_name/de/parentpage'>parentpage</a>" $test
 
         set l "parentpage1"
         set test [label "link" "not existing simple page" $l]
         set link [p create_link $l]
-        ? {$link render} [subst -nocommands {<a class='missing' href='/$instance_name/?nls_language=$expected_locale&amp;object_type=::xowiki::Page&amp;edit-new=1&amp;name=de:parentpage1&amp;parent_id=$folder_id&amp;title=parentpage1'> parentpage1</a>}] "\n$test\n "
+        ? {$link render} [subst -nocommands {<a class='missing' href='/$instance_name/?nls_language=$expected_locale&amp;object_type=::xowiki::Page&amp;edit-new=1&amp;name=de:parentpage1&amp;parent_id=$folder_id&amp;title=parentpage1'>parentpage1</a>}] $test
 
         set l "parentpage#a"
         set test [label "link" "existing simple with anchor" $l]
         set link [p create_link $l]
-        ? {$link render} [subst -nocommands {<a   href='/$instance_name/de/parentpage#a'>parentpage</a>}] "\n$test\n "
+        ? {$link render} [subst -nocommands {<a   href='/$instance_name/de/parentpage#a'>parentpage</a>}] $test
 
         set l "image:image.png"
         set test [label "link" "existing image" $l]
Index: openacs-4/packages/xowiki/tcl/test/xowiki-link-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/test/xowiki-link-test-procs.tcl,v
diff -u -r1.1.2.11 -r1.1.2.12
--- openacs-4/packages/xowiki/tcl/test/xowiki-link-test-procs.tcl	5 Dec 2021 17:01:01 -0000	1.1.2.11
+++ openacs-4/packages/xowiki/tcl/test/xowiki-link-test-procs.tcl	31 Dec 2021 11:22:34 -0000	1.1.2.12
@@ -74,7 +74,7 @@
         set locale [lang::system::locale]
         set lang [string range $locale 0 1]
 
-        ::xowiki::Package initialize -package_id $main_package_id
+        ::xowiki::Package require $main_package_id
         ::xowiki::Package initialize -package_id $linked_package_id
 
 
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.51 -r1.1.2.52
--- openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl	28 Jun 2021 19:57:42 -0000	1.1.2.51
+++ openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl	31 Dec 2021 11:22:34 -0000	1.1.2.52
@@ -60,7 +60,7 @@
         aa_run_with_teardown -rollback -test_code {
 
             set testfolder .testfolder
-            ::xowiki::Package initialize -package_id $package_id
+            ::xowiki::Package require $package_id
             set root_folder_id [::$package_id folder_id]
 
             lang::system::set_locale en_US
@@ -209,7 +209,7 @@
 
             set testfolder .testfolder
 
-            ::xowiki::Package initialize -package_id $package_id
+            ::xowiki::Package require $package_id
             set root_folder_id [::$package_id folder_id]
 
             # Create the test folder