Add Contact Page. Refactor Tests