Update templates, tests :art: