Index: openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs.tcl,v
diff -u -N -r1.44 -r1.44.2.1
--- openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs.tcl	27 Apr 2015 15:28:16 -0000	1.44
+++ openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs.tcl	17 Aug 2015 16:43:54 -0000	1.44.2.1
@@ -356,10 +356,7 @@
     Test the auth::password::change proc.
 } {
     aa_stub acs_mail_lite::send {
-	acs_mail_lite::send__arg_parser
-
-        global ns_sendmail_to
-        set ns_sendmail_to $to_addr
+        set ::ns_sendmail_to $to_addr
     }
 
     aa_run_with_teardown \
@@ -376,8 +373,7 @@
                     -secret_answer "no_answer"]
             set user_id $user_info(user_id)
 
-            global ns_sendmail_to
-            set ns_sendmail_to {ns_sendmail_UNCALLED}
+            set ::ns_sendmail_to {ns_sendmail_UNCALLED}
 
             parameter::set_value -parameter EmailAccountOwnerOnPasswordChangeP  -package_id [ad_acs_kernel_id] -value 1
             aa_true "Send email" [parameter::get -parameter EmailAccountOwnerOnPasswordChangeP -package_id [ad_acs_kernel_id] -default 1]
@@ -394,8 +390,8 @@
                 "ok"
             
             # Check that user gets email about changed password
-            aa_equals "Email sent to user" $ns_sendmail_to $email
-            set ns_sendmail_to {}
+            aa_equals "Email sent to user" $::ns_sendmail_to $email
+            set ::ns_sendmail_to {}
 
             # check that the new password is actually set correctly
             set password_correct_p [ad_check_password $user_id $new_password]
@@ -731,19 +727,15 @@
     Test acs-kernel.EmailAccountOwnerOnPasswordChangeP parameter
 } {
     aa_stub acs_mail_lite::send {
-	acs_mail_lite::send__arg_parser
-
-        global ns_sendmail_to
-        set ns_sendmail_to $to_addr
+        set ::ns_sendmail_to $to_addr
     }
 
     aa_run_with_teardown \
         -rollback \
         -test_code {
             parameter::set_value -parameter EmailAccountOwnerOnPasswordChangeP -package_id [ad_acs_kernel_id] -value 1
             
-            global ns_sendmail_to
-            set ns_sendmail_to {}
+            set ::ns_sendmail_to {}
            
             # Create a dummy local user
             set username [ad_generate_random_string]
@@ -779,8 +771,8 @@
             }
             
             # Check that we get email
-            aa_equals "Email sent to user" $ns_sendmail_to $email
-            set ns_sendmail_to {ns_sendmail_UNCALLED}
+            aa_equals "Email sent to user" $::ns_sendmail_to $email
+            set ::ns_sendmail_to {ns_sendmail_UNCALLED}
 
             # Set parameter to false
             parameter::set_value -parameter EmailAccountOwnerOnPasswordChangeP -package_id [ad_acs_kernel_id] -value 0
@@ -795,7 +787,7 @@
             aa_equals "Password change OK" $result(password_status) "ok"
             
             # Check that we do not get an email
-            aa_equals "Email NOT sent to user" $ns_sendmail_to {ns_sendmail_UNCALLED}
+            aa_equals "Email NOT sent to user" $::ns_sendmail_to {ns_sendmail_UNCALLED}
 
             ad_parameter_cache -delete [ad_acs_kernel_id] EmailAccountOwnerOnPasswordChangeP
         }