Index: openacs-4/packages/acs-templating/tcl/test/date-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/test/date-procs.tcl,v
diff -u -r1.5.2.7 -r1.5.2.8
--- openacs-4/packages/acs-templating/tcl/test/date-procs.tcl	20 Feb 2023 16:52:15 -0000	1.5.2.7
+++ openacs-4/packages/acs-templating/tcl/test/date-procs.tcl	20 Feb 2023 17:25:06 -0000	1.5.2.8
@@ -98,6 +98,7 @@
         template::data::to_sql::timestamp
         template::data::to_sql::date
         template::util::date::get_property
+        template::util::date::unpack
     } template_date_api {
         Test api manipulating the template date format.
 
@@ -179,6 +180,26 @@
                 [template::data::to_sql::timestamp $input] $expected
         }
 
+        set test_data {
+            {2023 2 20 0 0 0 {DD MONTH YYYY}}
+            2023-50-00
+            a
+            111
+            {1-1-1 a b c}
+            1-1-1
+            ""
+        }
+        set vars {year month day hours minutes seconds format}
+        foreach input $test_data {
+            template::util::date::unpack $input
+            set i 0
+            foreach v $vars {
+                aa_equals "template::util::date::unpack on '$input' for '$v' returns expected" \
+                    [set ${v}] [lindex $input $i]
+                incr i
+            }
+        }
+
     }
 
 # Local variables:
Index: openacs-4/packages/acs-templating/tcl/test/parse-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/test/parse-test-procs.tcl,v
diff -u -r1.10.2.15 -r1.10.2.16
--- openacs-4/packages/acs-templating/tcl/test/parse-test-procs.tcl	13 Oct 2022 12:55:19 -0000	1.10.2.15
+++ openacs-4/packages/acs-templating/tcl/test/parse-test-procs.tcl	20 Feb 2023 17:29:21 -0000	1.10.2.16
@@ -204,6 +204,7 @@
         template::get_body_event_handlers
         template::prepare_body_script_multirow
         template::multirow
+        template::collect_body_scripts
     } \
     templates_and_scripts {
 
@@ -311,7 +312,7 @@
 
         template::add_refresh_on_history_handler
 
-        set page [template::adp_include /packages/acs-templating/lib/body_scripts {}]
+        set page [template::collect_body_scripts]
 
         aa_equals "Page contains exactly 11 additional scripts (body handlers are grouped together)" \
             [regsub -all "<script" $page {} _] [expr {$starting_body_scripts + 11}]