1. Added changes to template and test page