Remove code clone.
Fix tests to check more properties.