Add contact page and refactor tests