Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

The templates are being used for many tests reusing the same available function forms.
The format they are provided allow us to extend tests with cases for other tests relying
in the same formats.

Ref #822

Take advantage of a recent extension to the test generation tool in
order to limit duplication.