Add contact page
Refactor test suite