Fix tests for new template.

@sancus r?