edit contact page and tests
Merge branch 'aaron'