Adds contact page and refactors test