Add Contact page, Refactor Tests