Changes to Contact equals and hashCode methods, renamed test