Add Contact page. Refactor tests