Added contact page and DRYed the test suite