Index: openacs-4/packages/acs-automated-testing/www/admin/rerun.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/rerun.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/acs-automated-testing/www/admin/rerun.tcl	26 Jun 2015 20:50:09 -0000	1.6
+++ openacs-4/packages/acs-automated-testing/www/admin/rerun.tcl	17 Aug 2015 15:29:28 -0000	1.6.2.1
@@ -1,29 +1,33 @@
 ad_page_contract {
     @cvs-id $Id$
 } {
-    {package_key ""}
+    {package_key:token ""}
     {category:aa_test_category ""}
     {view_by:aa_test_view_by "package"}
-    {testcase_id:naturalnum,notnull ""}
+    {testcase_id:word,notnull ""}
     {quiet:boolean "0"}
     {stress:boolean "0"}
     {security_risk:boolean "0"}
 } -properties {
 }
 
 if {$testcase_id eq ""} {
-  if {$quiet} {
-    aa_runseries -stress $stress -security_risk $security_risk -quiet $package_key $category
-  } else {
-    aa_runseries -stress $stress -security_risk $security_risk $package_key $category
-  }
-  ad_returnredirect "index?by_package_key=$package_key&by_category=$category&view_by=$view_by&quiet=$quiet&stress=$stress&security_risk=$security_risk"
+    if {$quiet} {
+	aa_runseries -stress $stress -security_risk $security_risk -quiet $package_key $category
+    } else {
+	aa_runseries -stress $stress -security_risk $security_risk $package_key $category
+    }
+    
+    ad_returnredirect [export_vars -base index {
+	{by_package_key $package_key}
+	{by_category $category}
+	view_by quiet stress security_risk}]
 } else {
-  if {$quiet} {
-    aa_runseries -quiet -testcase_id $testcase_id "" ""
-  } else {
-    aa_runseries -testcase_id $testcase_id "" ""
-  }
-  ad_returnredirect "testcase?testcase_id=$testcase_id&package_key=$package_key&quiet=$quiet"
+    if {$quiet} {
+	aa_runseries -quiet -testcase_id $testcase_id "" ""
+    } else {
+	aa_runseries -testcase_id $testcase_id "" ""
+    }
+    ad_returnredirect "testcase?testcase_id=$testcase_id&package_key=$package_key&quiet=$quiet"
 }
 
Index: openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl,v
diff -u -r1.13 -r1.13.2.1
--- openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl	27 Jun 2015 17:13:45 -0000	1.13
+++ openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl	17 Aug 2015 15:29:29 -0000	1.13.2.1
@@ -1,8 +1,8 @@
 ad_page_contract {
     @cvs-id $Id$
 } {
-    testcase_id:naturalnum,notnull
-    package_key:nohtml
+    testcase_id:word,notnull
+    package_key:token
     {showsource:boolean 0}
     {quiet:boolean 1}
 } -properties {