Add contact page and remove some duplication in tests