Improve HashAndEqualsTest