Add Contact page and improve test