Add contact page, update tests