Add Contact page, improve test spec