Add a Contact page
Remove test code duplication