Added Contact page and refactored tests