Rename constraints of Sf
Add ValidatorNumber
Fix test for sf 2.2 validator