Added contact page and optimized tests