Add contact page and DRY up testing code