Index: openacs-4/packages/new-portal/tcl/test/new-portal-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/test/new-portal-test-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/new-portal/tcl/test/new-portal-test-procs.tcl	7 Aug 2017 23:48:12 -0000	1.3
+++ openacs-4/packages/new-portal/tcl/test/new-portal-test-procs.tcl	19 Jul 2018 12:26:39 -0000	1.4
@@ -49,7 +49,7 @@
                 and p1.pretty_name = p2.pretty_name
                 "]
 
-            aa_true "Pages in correct order" [expr {$correct_page_count == 3}]
+            aa_true "Pages in correct order" {$correct_page_count == 3}
 	}
 
 }
Index: openacs-4/packages/oacs-dav/tcl/test/oacs-dav-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/tcl/test/oacs-dav-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/oacs-dav/tcl/test/oacs-dav-procs.tcl	9 Jul 2018 12:03:33 -0000	1.5
+++ openacs-4/packages/oacs-dav/tcl/test/oacs-dav-procs.tcl	19 Jul 2018 12:26:39 -0000	1.6
@@ -21,7 +21,7 @@
 	    set sc_ops [db_list get_dav_ops ""]
 	    set valid_ops [list get put mkcol copy propfind proppatch move delete]
 	    foreach op_name $valid_ops {
-		aa_true "$op_name operation created" [expr {[lsearch $sc_ops $op_name] > -1}]
+		aa_true "$op_name operation created" {[lsearch $sc_ops $op_name] > -1}
 	    }
 
     	    aa_true "DAV put_type Service contract created" [expr [db_0or1row get_dav_pt_sc ""]]
@@ -68,9 +68,9 @@
 	    aa_log "Response was $response"
 	    set new_item_id [db_string item_exists "" -default ""]
 	    aa_log "Item_id=$new_item_id"
-	    aa_true "Content Item Created" [expr {$new_item_id ne ""}] 
+	    aa_true "Content Item Created" {$new_item_id ne ""} 
 	    set revision_id [db_string revision_exists "" -default ""]	    
-	    aa_true "Content Revision Created"  [expr {$revision_id ne ""}] 
+	    aa_true "Content Revision Created"  {$revision_id ne ""} 
 	    set cr_filename "[cr_fs_path]/[db_string get_content_filename ""]"
 	    aa_true "Content Attribute Set" {$tmpfilesize == [file size $cr_filename]}
 	    
@@ -105,7 +105,7 @@
 		aa_log "name $fname uri $uri"
 		set response [oacs_dav::impl::content_folder::mkcol]
 		set new_folder_id [db_string folder_exists "" -default ""]
-		aa_true "Content Folder $fname created" [expr {$new_folder_id ne ""}] 
+		aa_true "Content Folder $fname created" {$new_folder_id ne ""} 
 	    }
 	
 	}
Index: openacs-4/packages/views/tcl/test/views-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/views/tcl/test/views-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/views/tcl/test/views-procs.tcl	7 Aug 2017 23:48:30 -0000	1.3
+++ openacs-4/packages/views/tcl/test/views-procs.tcl	19 Jul 2018 12:26:39 -0000	1.4
@@ -18,32 +18,32 @@
 				set object_id_list [db_list get_object_id_list "select ao.object_id from acs_objects ao left outer join (select object_id from views_views where viewer_id != :viewer_id) vt on ao.object_id = vt.object_id"]
 				set object_id [lindex [util::randomize_list $object_id_list] 0]
 				
-				aa_false "User view object_id" [expr {[views::viewed_p -object_id $object_id -user_id 0] > 0}]
+				aa_false "User view object_id" {[views::viewed_p -object_id $object_id -user_id 0] > 0}
 				
 				aa_log "User_id is $viewer_id, object is $object_id"
 				
 				views::record_view -object_id $object_id -viewer_id $viewer_id
 				
 				set count_record [db_string count_record "select count(*) from  views_views where object_id = :object_id and viewer_id = :viewer_id" -default 0]
 				
-				aa_true "Record add" [expr {$count_record > 0}]
+				aa_true "Record add" {$count_record > 0}
 				
 				set count_views [db_string count_views "select views_count from views_views where object_id = :object_id and viewer_id = :viewer_id" -default 0]
 				
 				views::record_view -object_id $object_id -viewer_id $viewer_id
 				#Update count views
 				set count_record [db_string count_record "select count(*) from  views_views where object_id = :object_id and viewer_id = :viewer_id" -default 0]
 				
-				aa_true "Update record but don't insert new row" [expr {$count_record == 1}]
+				aa_true "Update record but don't insert new row" {$count_record == 1}
 				
 				set count_views2 [db_string count_views2 "select views_count from views_views where object_id = :object_id and viewer_id = :viewer_id" -default 0]
 				
-				aa_true "Count_view is updated" [expr {$count_views2 > $count_views}]
+				aa_true "Count_view is updated" {$count_views2 > $count_views}
 				
 				set get [views::get -object_id $object_id]
 				aa_log "Return of function views::get $get"
 				
-				aa_true "User view object_id" [expr {[views::viewed_p -object_id $object_id -user_id $viewer_id] > 0}]
+				aa_true "User view object_id" {[views::viewed_p -object_id $object_id -user_id $viewer_id] > 0}
 				
 				set all_views_count [db_string count_views_views "select sum(views_count) from views_views where object_id = :object_id"]
 				set view_count_aggregates [db_string get_views_count "select views_count from view_aggregates where object_id = :object_id"]
@@ -70,32 +70,32 @@
 			
 			set type test
 			
-			aa_false "User has viewed object_id" [expr {[views::viewed_p -object_id $object_id -user_id $viewer_id -type $type] > 0}]
+			aa_false "User has viewed object_id" {[views::viewed_p -object_id $object_id -user_id $viewer_id -type $type] > 0}
 			
 			aa_log "User_id is $viewer_id, object is $object_id and type $type"
 			
 			views::record_view -object_id $object_id -viewer_id $viewer_id -type $type
 			
 			set count_record [db_string count_record "select count(*) from  views_by_type where object_id = :object_id and viewer_id = :viewer_id" -default 0]
 			
-			aa_true "Record add" [expr {$count_record > 0}]
+			aa_true "Record add" {$count_record > 0}
 			
 			set count_views [db_string count_views "select views_count from views_by_type where object_id = :object_id and viewer_id = :viewer_id" -default 0]
 			
 			views::record_view -object_id $object_id -viewer_id $viewer_id -type $type
 			#Update count views
 			set count_record [db_string count_record "select count(*) from  views_by_type where object_id = :object_id and viewer_id = :viewer_id" -default 0]
 			
-			aa_true "Update record but don't insert new row" [expr {$count_record == 1}]
+			aa_true "Update record but don't insert new row" {$count_record == 1}
 			
 			set count_views2 [db_string count_views2 "select views_count from views_by_type where object_id = :object_id and viewer_id = :viewer_id" -default 0]
 			
-			aa_true "Count_view is updated" [expr {$count_views2 > $count_views}]
+			aa_true "Count_view is updated" {$count_views2 > $count_views}
 			
 			set get [views::get -object_id $object_id]
 			aa_log "Return of function views::get $get"
 			
-			aa_true "User has viewed object_id" [expr {[views::viewed_p -object_id $object_id -user_id $viewer_id -type $type] > 0}]
+			aa_true "User has viewed object_id" {[views::viewed_p -object_id $object_id -user_id $viewer_id -type $type] > 0}
 			set all_views_count [db_string count_views_views "select sum(views_count) from views_by_type where object_id = :object_id and view_type=:type"]
 			set view_count_aggregates [db_string get_views_count "select views_count from view_aggregates_by_type where object_id = :object_id and view_type=:type"]
 			aa_equals "views_count on view_aggregates is equal to sum views_count on views_views" $view_count_aggregates $all_views_count
Index: openacs-4/packages/workflow/tcl/test/workflow-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/test/workflow-test-procs.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/workflow/tcl/test/workflow-test-procs.tcl	29 Dec 2017 11:36:39 -0000	1.19
+++ openacs-4/packages/workflow/tcl/test/workflow-test-procs.tcl	19 Jul 2018 12:26:39 -0000	1.20
@@ -529,7 +529,7 @@
             workflow::role::get -role_id $role_id -array role
 
             aa_true "checking that role names of workflow can be fetched with workflow::get_roles and workflow::role::get" \
-                  [expr {$role(short_name) in $expect_role_names}]
+                  {$role(short_name) in $expect_role_names}
 
         }
 
@@ -539,7 +539,7 @@
             workflow::action::get -action_id $action_id -array action
 
             aa_true "checking retrieval of action names with workflow::get_actions and workflow::get" \
-                    [expr {$action(short_name) in $expect_action_names}]
+                    {$action(short_name) in $expect_action_names}
 
         }