Adding contact page & refactoring tests