Index: openacs-4/packages/acs-automated-testing/www/admin/clear.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/clear.tcl,v
diff -u -r1.2.26.1 -r1.2.26.2
--- openacs-4/packages/acs-automated-testing/www/admin/clear.tcl	5 Aug 2014 12:40:51 -0000	1.2.26.1
+++ openacs-4/packages/acs-automated-testing/www/admin/clear.tcl	25 Aug 2014 08:17:04 -0000	1.2.26.2
@@ -4,7 +4,7 @@
   {package_key ""}
   {category:aa_test_category ""}
   {view_by:aa_test_view_by "package"}
-  {testcase_id:naturalnum ""}
+  {testcase_id ""}
   {quiet:boolean "0"}
 } -properties {
 }
Index: openacs-4/packages/acs-automated-testing/www/admin/component.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/component.tcl,v
diff -u -r1.3.22.1 -r1.3.22.2
--- openacs-4/packages/acs-automated-testing/www/admin/component.tcl	5 Aug 2014 12:40:51 -0000	1.3.22.1
+++ openacs-4/packages/acs-automated-testing/www/admin/component.tcl	25 Aug 2014 08:17:04 -0000	1.3.22.2
@@ -1,7 +1,7 @@
 ad_page_contract {
   @cvs-id $Id$
 } {
-  component_id:naturalnum,nonull
+  component_id:notnull
   package_key:nohtml
 } -properties {
   title:onevalue
@@ -16,8 +16,7 @@
 
 set component_bodys {}
 foreach component [nsv_get aa_test components] {
-  if {$component_id == [lindex $component 0] &&
-      $package_key == [lindex $component 1]} {
+  if {$component_id eq [lindex $component 0] && $package_key eq [lindex $component 1]} {
     set component_desc [lindex $component 2]
     set component_file [lindex $component 3]
     set component_body [lindex $component 4]
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.4.10.1 -r1.4.10.2
--- openacs-4/packages/acs-automated-testing/www/admin/rerun.tcl	5 Aug 2014 12:40:51 -0000	1.4.10.1
+++ openacs-4/packages/acs-automated-testing/www/admin/rerun.tcl	25 Aug 2014 08:17:04 -0000	1.4.10.2
@@ -4,7 +4,7 @@
     {package_key ""}
     {category:aa_test_category ""}
     {view_by:aa_test_view_by "package"}
-    {testcase_id:naturalnum ""}
+    {testcase_id ""}
     {quiet:boolean "0"}
     {stress:boolean "0"}
     {security_risk:boolean "0"}
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.9.10.1 -r1.9.10.2
--- openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl	5 Aug 2014 12:40:51 -0000	1.9.10.1
+++ openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl	25 Aug 2014 08:17:04 -0000	1.9.10.2
@@ -1,7 +1,7 @@
 ad_page_contract {
     @cvs-id $Id$
 } {
-    testcase_id:naturalnum,nonull
+    testcase_id:notnull
     package_key:nohtml
     {showsource:boolean 0}
     {quiet:boolean 1}
@@ -47,11 +47,9 @@
 
 set testcase_bodys {}
 foreach testcase [nsv_get aa_test cases] {
-    if {$testcase_id == [lindex $testcase 0] &&
-        $package_key == [lindex $testcase 3]} {
+    if {$testcase_id eq [lindex $testcase 0] && $package_key eq [lindex $testcase 3]} {
         set testcase_desc     [lindex $testcase 1]
         set testcase_file     [lindex $testcase 2]
-        set package_key       [lindex $testcase 3]
         set testcase_cats     [join [lindex $testcase 4] ", "]
         set testcase_inits    [join [lindex $testcase 5] ", "]
         set testcase_on_error [lindex $testcase 6]