Added contact page, refactored tests