Adds more test coverage of Contact & fixed bug found in equality support

Adds more test coverage of Contact & fixed bug found in equality support #332