More Equals methods in entities, more tests