Add contact us page and refactor tests to avoid code duplication