ticket:1 Done. Template updated. Bug with test passing fixed.