Remove template test identifier. Fix subject labels in template.