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.53.2.3 -r1.53.2.4
--- openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs.tcl	4 Apr 2019 08:14:04 -0000	1.53.2.3
+++ openacs-4/packages/acs-authentication/tcl/test/acs-authentication-procs.tcl	24 Apr 2019 16:39:08 -0000	1.53.2.4
@@ -210,14 +210,11 @@
         -test_code {
 
             # Successful creation
-            array set user_info [auth::create_user \
-                                     -username "auth_create_user1" \
-                                     -email "auth_create_user1@test_user.com" \
-                                     -first_names "Test" \
-                                     -last_name "User" \
-                                     -password "changeme" \
-                                     -secret_question "no_question" \
-                                     -secret_answer "no_answer"]
+            array set user_info [acs::test::user::create]
+            set user [acs_user::get -user_id $user_info(user_id)]
+            set username     [dict get $user username]
+            set email        [dict get $user email]
+            set authority_id [dict get $user authority_id]
 
             aa_true "returns creation_status" [info exists user_info(creation_status)]
 
@@ -241,8 +238,9 @@
             # Duplicate email and username
             array unset user_info
             array set user_info [auth::create_user \
-                                     -username "auth_create_user1" \
-                                     -email "auth_create_user1@test_user.com" \
+                                     -username $username \
+                                     -email $email \
+                                     -authority_id $authority_id \
                                      -first_names "Test3" \
                                      -last_name "User" \
                                      -password "changeme" \
@@ -260,14 +258,15 @@
                 aa_true "element_message for email exists" \
 		    {[info exists elm_msgs(email)] && $elm_msgs(email) ne ""}
             }
-            set user_id [acs_user::get_by_username -username auth_create_user1]
+            set user_id [acs_user::get_by_username -authority_id $authority_id -username $username]
             if { $user_id ne "" } {
                 acs_user::delete -user_id $user_id
             }
 
             # Missing first_names, last_name, email
             array unset user_info
             array set user_info [auth::create_user \
+                                     -authority_id $authority_id \
                                      -username "auth_create_user2" \
                                      -email "" \
                                      -first_names "" \
@@ -294,14 +293,15 @@
                     aa_log "element_message(last_name) = $elm_msgs(last_name)"
                 }
             }
-            set user_id [acs_user::get_by_username -username auth_create_user2]
+            set user_id [acs_user::get_by_username -authority_id $authority_id -username auth_create_user2]
             if { $user_id ne "" } {
                 acs_user::delete -user_id $user_id
             }
 
             # Malformed email
             array unset user_info
             array set user_info [auth::create_user \
+                                     -authority_id $authority_id \
                                      -username [ad_generate_random_string] \
                                      -email "not an email" \
                                      -first_names "[ad_generate_random_string]<[ad_generate_random_string]" \