Fix specs to use new template