Rewrite DataValueConstraintTest
Improve equals tests