Add Contact Us page and mini refactor tests