Update templates and tests