fix(templates): Generate templates and tests updated