Fix typo in validator
Fix validation tests