Updated with additional contact page and contact tests