Changes to Contact and ContactTest