Add Contact Page and Refactor Tests