Index: openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl,v
diff -u -N -r1.18.2.3 -r1.18.2.4
--- openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl	20 Oct 2015 08:19:13 -0000	1.18.2.3
+++ openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl	23 Feb 2017 10:37:14 -0000	1.18.2.4
@@ -533,7 +533,7 @@
 
     # Read the contents of the catalog file
     array set catalog_array [lang::catalog::parse [lang::catalog::read_file $catalog_file]]
-    array set updated_messages_array [lindex [array get catalog_array messages] 1]
+    array set updated_messages_array $catalog_array(messages)
 
     # Assert that the old messages are unchanged
     foreach old_message_key [array names messages_array] { 
@@ -857,11 +857,11 @@
         set system_timezone [lang::system::timezone]
         set user_timezone [lang::user::timezone]
 
-
         set timezones [lc_list_all_timezones]
+        set n [expr {[llength $timezones]-1}]
         
-        set desired_user_timezone [lindex [lindex $timezones [randomRange [expr {[llength $timezones]-1}]]] 0]
-        set desired_system_timezone [lindex [lindex $timezones [randomRange [expr {[llength $timezones]-1}]]] 0]
+        set desired_user_timezone [lindex [lindex $timezones [randomRange $n]] 0]
+        set desired_system_timezone [lindex [lindex $timezones [randomRange $n]] 0]
         
         set error_p 0
         with_catch errmsg {