Update spec templates
Fix and add to endorsement tests