Add contact page, optimize tests